Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 543a07b1 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Kumar Gala
Browse files

powerpc/85xx: separate cpm2 pic init 



Separate handling of CPM2 PIC initialization to mpc85xx_cpm2_pic_init()
function.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 5d713495

arch/powerpc/platforms/85xx/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
#

obj-$(CONFIG_SMP) += smp.o



obj-y += mpc85xx_common.o



obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o

obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o

obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o

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

+2 −27
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <asm/cpm2.h>

#include <sysdev/cpm2_pic.h>



#include "mpc85xx.h"



#define KSI8560_CPLD_HVR		0x04 /* Hardware Version Register */

#define KSI8560_CPLD_PVR		0x08 /* PLD Version Register */
@@ -54,25 +55,11 @@ static void machine_restart(char *cmd) 
	for (;;);

}



static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)

{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	int cascade_irq;



	while ((cascade_irq = cpm2_get_irq()) >= 0)

		generic_handle_irq(cascade_irq);



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

}



static void __init ksi8560_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;

	struct device_node *np;

#ifdef CONFIG_CPM2

	int irq;

#endif



	np = of_find_node_by_type(NULL, "open-pic");
@@ -95,19 +82,7 @@ static void __init ksi8560_pic_init(void) 


	mpic_init(mpic);



#ifdef CONFIG_CPM2

	/* Setup CPM2 PIC */

	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");

	if (np == NULL) {

		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");

		return;

	}

	irq = irq_of_parse_and_map(np, 0);



	cpm2_pic_init(np);

	of_node_put(np);

	irq_set_chained_handler(irq, cpm2_cascade);

#endif

	mpc85xx_cpm2_pic_init();

}



#ifdef CONFIG_CPM2

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

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#include <sysdev/fsl_soc.h>

#include <sysdev/fsl_pci.h>



#include "mpc85xx.h"



void __init mpc8536_ds_pic_init(void)

{

	struct mpic *mpic;

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

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef MPC85xx_H

#define MPC85xx_H

#ifdef CONFIG_CPM2

extern void mpc85xx_cpm2_pic_init(void);

#else

static inline void __init mpc85xx_cpm2_pic_init(void) {}

#endif /* CONFIG_CPM2 */



#endif

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

+3 −31
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
#include <sysdev/cpm2_pic.h>

#endif



#include "mpc85xx.h"



#ifdef CONFIG_PCI

static int mpc85xx_exclude_device(struct pci_controller *hose,

				   u_char bus, u_char devfn)
@@ -46,29 +48,11 @@ static int mpc85xx_exclude_device(struct pci_controller *hose, 
}

#endif /* CONFIG_PCI */



#ifdef CONFIG_CPM2



static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)

{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	int cascade_irq;



	while ((cascade_irq = cpm2_get_irq()) >= 0)

		generic_handle_irq(cascade_irq);



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

}



#endif /* CONFIG_CPM2 */



static void __init mpc85xx_ads_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;

	struct device_node *np = NULL;

#ifdef CONFIG_CPM2

	int irq;

#endif



	np = of_find_node_by_type(np, "open-pic");

	if (!np) {
@@ -90,19 +74,7 @@ static void __init mpc85xx_ads_pic_init(void) 


	mpic_init(mpic);



#ifdef CONFIG_CPM2

	/* Setup CPM2 PIC */

	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");

	if (np == NULL) {

		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");

		return;

	}

	irq = irq_of_parse_and_map(np, 0);



	cpm2_pic_init(np);

	of_node_put(np);

	irq_set_chained_handler(irq, cpm2_cascade);

#endif

	mpc85xx_cpm2_pic_init();

}



/*