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

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

powerpc/83xx: consolidate init_IRQ functions 



On mpc83xx platform nearly all _init_IRQ functions look alike. They either
just setup ipic, or setup ipic and QE PIC. Separate this to special functions
to be either referenced from ppc_md, or called from board file.

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

arch/powerpc/platforms/83xx/asp834x.c

+1 −19
Original line number Diff line number Diff line
@@ -36,24 +36,6 @@ static void __init asp834x_setup_arch(void) 
	mpc834x_usb_cfg();

}



static void __init asp834x_init_IRQ(void)

{

	struct device_node *np;



	np = of_find_node_by_type(NULL, "ipic");

	if (!np)

		return;



	ipic_init(np, 0);



	of_node_put(np);



	/* Initialize the default interrupt mapping priorities,

	 * in case the boot rom changed something on us.

	 */

	ipic_set_default_priority();

}



static struct __initdata of_device_id asp8347_ids[] = {

	{ .type = "soc", },

	{ .compatible = "soc", },
@@ -82,7 +64,7 @@ define_machine(asp834x) { 
	.name			= "ASP8347E",

	.probe			= asp834x_probe,

	.setup_arch		= asp834x_setup_arch,

	.init_IRQ		= asp834x_init_IRQ,

	.init_IRQ		= mpc83xx_ipic_init_IRQ,

	.get_irq		= ipic_get_irq,

	.restart		= mpc83xx_restart,

	.time_init		= mpc83xx_time_init,

arch/powerpc/platforms/83xx/km83xx.c

+1 −32
Original line number Diff line number Diff line
@@ -140,37 +140,6 @@ static int __init kmeter_declare_of_platform_devices(void) 
}

machine_device_initcall(mpc83xx_km, kmeter_declare_of_platform_devices);



static void __init mpc83xx_km_init_IRQ(void)

{

	struct device_node *np;



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

	if (!np) {

		np = of_find_node_by_type(NULL, "ipic");

		if (!np)

			return;

	}



	ipic_init(np, 0);



	/* Initialize the default interrupt mapping priorities,

	 * in case the boot rom changed something on us.

	 */

	ipic_set_default_priority();

	of_node_put(np);



#ifdef CONFIG_QUICC_ENGINE

	np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");

	if (!np) {

		np = of_find_node_by_type(NULL, "qeic");

		if (!np)

			return;

	}

	qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);

	of_node_put(np);

#endif				/* CONFIG_QUICC_ENGINE */

}



/* list of the supported boards */

static char *board[] __initdata = {

	"Keymile,KMETER1",
@@ -198,7 +167,7 @@ define_machine(mpc83xx_km) { 
	.name		= "mpc83xx-km-platform",

	.probe		= mpc83xx_km_probe,

	.setup_arch	= mpc83xx_km_setup_arch,

	.init_IRQ	= mpc83xx_km_init_IRQ,

	.init_IRQ	= mpc83xx_ipic_and_qe_init_IRQ,

	.get_irq	= ipic_get_irq,

	.restart	= mpc83xx_restart,

	.time_init	= mpc83xx_time_init,

arch/powerpc/platforms/83xx/misc.c

+46 −0
Original line number Diff line number Diff line
@@ -11,9 +11,12 @@ 


#include <linux/stddef.h>

#include <linux/kernel.h>

#include <linux/of_platform.h>



#include <asm/io.h>

#include <asm/hw_irq.h>

#include <asm/ipic.h>

#include <asm/qe_ic.h>

#include <sysdev/fsl_soc.h>



#include "mpc83xx.h"
@@ -65,3 +68,46 @@ long __init mpc83xx_time_init(void) 


	return 0;

}



void __init mpc83xx_ipic_init_IRQ(void)

{

	struct device_node *np;



	/* looking for fsl,pq2pro-pic which is asl compatible with fsl,ipic */

	np = of_find_compatible_node(NULL, NULL, "fsl,ipic");

	if (!np)

		np = of_find_node_by_type(NULL, "ipic");

	if (!np)

		return;



	ipic_init(np, 0);



	of_node_put(np);



	/* Initialize the default interrupt mapping priorities,

	 * in case the boot rom changed something on us.

	 */

	ipic_set_default_priority();

}



#ifdef CONFIG_QUICC_ENGINE

void __init mpc83xx_qe_init_IRQ(void)

{

	struct device_node *np;



	np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");

	if (!np) {

		np = of_find_node_by_type(NULL, "qeic");

		if (!np)

			return;

	}

	qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);

	of_node_put(np);

}



void __init mpc83xx_ipic_and_qe_init_IRQ(void)

{

	mpc83xx_ipic_init_IRQ();

	mpc83xx_qe_init_IRQ();

}

#endif /* CONFIG_QUICC_ENGINE */

arch/powerpc/platforms/83xx/mpc830x_rdb.c

+1 −17
Original line number Diff line number Diff line
@@ -41,22 +41,6 @@ static void __init mpc830x_rdb_setup_arch(void) 
	mpc831x_usb_cfg();

}



static void __init mpc830x_rdb_init_IRQ(void)

{

	struct device_node *np;



	np = of_find_node_by_type(NULL, "ipic");

	if (!np)

		return;



	ipic_init(np, 0);



	/* Initialize the default interrupt mapping priorities,

	 * in case the boot rom changed something on us.

	 */

	ipic_set_default_priority();

}



static const char *board[] __initdata = {

	"MPC8308RDB",

	"fsl,mpc8308rdb",
@@ -89,7 +73,7 @@ define_machine(mpc830x_rdb) { 
	.name			= "MPC830x RDB",

	.probe			= mpc830x_rdb_probe,

	.setup_arch		= mpc830x_rdb_setup_arch,

	.init_IRQ		= mpc830x_rdb_init_IRQ,

	.init_IRQ		= mpc83xx_ipic_init_IRQ,

	.get_irq		= ipic_get_irq,

	.restart		= mpc83xx_restart,

	.time_init		= mpc83xx_time_init,

arch/powerpc/platforms/83xx/mpc831x_rdb.c

+1 −17
Original line number Diff line number Diff line
@@ -44,22 +44,6 @@ static void __init mpc831x_rdb_setup_arch(void) 
	mpc831x_usb_cfg();

}



static void __init mpc831x_rdb_init_IRQ(void)

{

	struct device_node *np;



	np = of_find_node_by_type(NULL, "ipic");

	if (!np)

		return;



	ipic_init(np, 0);



	/* Initialize the default interrupt mapping priorities,

	 * in case the boot rom changed something on us.

	 */

	ipic_set_default_priority();

}



static const char *board[] __initdata = {

	"MPC8313ERDB",

	"fsl,mpc8315erdb",
@@ -92,7 +76,7 @@ define_machine(mpc831x_rdb) { 
	.name			= "MPC831x RDB",

	.probe			= mpc831x_rdb_probe,

	.setup_arch		= mpc831x_rdb_setup_arch,

	.init_IRQ		= mpc831x_rdb_init_IRQ,

	.init_IRQ		= mpc83xx_ipic_init_IRQ,

	.get_irq		= ipic_get_irq,

	.restart		= mpc83xx_restart,

	.time_init		= mpc83xx_time_init,