Commit 92189c90 authored by Pali Rohár's avatar Pali Rohár Committed by Michael Ellerman
Browse files

powerpc/85xx: mpc85xx_ds: Move i8259 code into own file 



In order to share mpc85xx i8259 code between DS and P2020.
Prefix i8259 debug and error messages by i8259 word.

Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
[mpe: Fix some coding style warnings in the moved code]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230408140122.25293-10-pali@kernel.org
parent c30aa8fd

arch/powerpc/platforms/85xx/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o 
obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o

obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o

obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o

obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o p2020.o

obj8259-$(CONFIG_PPC_I8259)   += mpc85xx_8259.o

obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o p2020.o $(obj8259-y)

obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o

obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o p2020.o

obj-$(CONFIG_P1010_RDB)   += p1010rdb.o

arch/powerpc/platforms/85xx/mpc85xx.h

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ extern void mpc85xx_qe_par_io_init(void); 
static inline void __init mpc85xx_qe_par_io_init(void) {}

#endif



#ifdef CONFIG_PPC_I8259

void __init mpc85xx_8259_init(void);

#else

static inline void __init mpc85xx_8259_init(void) {}

#endif



void __init mpc85xx_ds_pic_init(void);

void __init mpc85xx_ds_setup_arch(void);

void __init mpc85xx_rdb_setup_arch(void);

arch/powerpc/platforms/85xx/mpc85xx_8259.c

0 → 100644
+64 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * MPC85xx 8259 functions for DS Board Setup

 *

 * Author Xianghua Xiao (x.xiao@freescale.com)

 * Roy Zang <tie-fei.zang@freescale.com>

 *      - Add PCI/PCI Express support

 * Copyright 2007 Freescale Semiconductor Inc.

 */



#include <linux/stddef.h>

#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>



#include <asm/mpic.h>

#include <asm/i8259.h>



#include "mpc85xx.h"



static void mpc85xx_8259_cascade(struct irq_desc *desc)

{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	unsigned int cascade_irq = i8259_irq();



	if (cascade_irq)

		generic_handle_irq(cascade_irq);



	chip->irq_eoi(&desc->irq_data);

}



void __init mpc85xx_8259_init(void)

{

	struct device_node *np;

	struct device_node *cascade_node = NULL;

	int cascade_irq;



	/* Initialize the i8259 controller */

	for_each_node_by_type(np, "interrupt-controller") {

		if (of_device_is_compatible(np, "chrp,iic")) {

			cascade_node = np;

			break;

		}

	}



	if (cascade_node == NULL) {

		pr_debug("i8259: Could not find i8259 PIC\n");

		return;

	}



	cascade_irq = irq_of_parse_and_map(cascade_node, 0);

	if (!cascade_irq) {

		pr_err("i8259: Failed to map cascade interrupt\n");

		return;

	}



	pr_debug("i8259: cascade mapped to irq %d\n", cascade_irq);



	i8259_init(cascade_node, 0);

	of_node_put(cascade_node);



	irq_set_chained_handler(cascade_irq, mpc85xx_8259_cascade);

}

arch/powerpc/platforms/85xx/mpc85xx_ds.c

+0 −46
Original line number Diff line number Diff line
@@ -34,52 +34,6 @@ 


#include "mpc85xx.h"



static void mpc85xx_8259_cascade(struct irq_desc *desc)

{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	unsigned int cascade_irq = i8259_irq();



	if (cascade_irq) {

		generic_handle_irq(cascade_irq);

	}

	chip->irq_eoi(&desc->irq_data);

}



static void __init mpc85xx_8259_init(void)

{

	struct device_node *np;

	struct device_node *cascade_node = NULL;

	int cascade_irq;



	if (!IS_ENABLED(CONFIG_PPC_I8259))

		return;



	/* Initialize the i8259 controller */

	for_each_node_by_type(np, "interrupt-controller")

	    if (of_device_is_compatible(np, "chrp,iic")) {

		cascade_node = np;

		break;

	}



	if (cascade_node == NULL) {

		pr_debug("Could not find i8259 PIC\n");

		return;

	}



	cascade_irq = irq_of_parse_and_map(cascade_node, 0);

	if (!cascade_irq) {

		pr_err("Failed to map cascade interrupt\n");

		return;

	}



	pr_debug("mpc85xxds: cascade mapped to irq %d\n", cascade_irq);



	i8259_init(cascade_node, 0);

	of_node_put(cascade_node);



	irq_set_chained_handler(cascade_irq, mpc85xx_8259_cascade);

}



void __init mpc85xx_ds_pic_init(void)

{

	struct mpic *mpic;