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

Commit 0529e315 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: use common irqchip_init for GIC init 



Convert all GIC DT initialization over to use common irqchip_init
function.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
parent 81243e44

arch/arm/include/asm/hardware/gic.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ extern struct irq_chip gic_arch_extn; 


void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,

		    u32 offset, struct device_node *);

int gic_of_init(struct device_node *node, struct device_node *parent);

void gic_secondary_init(unsigned int);

void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);

arch/arm/mach-bcm/board_bcm.c

+2 −14
Original line number Diff line number Diff line
@@ -11,22 +11,15 @@ 
 * GNU General Public License for more details.

 */



#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/irqchip.h>



#include <asm/mach/arch.h>

#include <asm/hardware/gic.h>



#include <asm/mach/time.h>



static const struct of_device_id irq_match[] = {

	{.compatible = "arm,cortex-a9-gic", .data = gic_of_init, },

	{}

};



static void timer_init(void)

{

}
@@ -35,11 +28,6 @@ static struct sys_timer timer = { 
	.init = timer_init,

};



static void __init init_irq(void)

{

	of_irq_init(irq_match);

}



static void __init board_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL,
@@ -49,7 +37,7 @@ static void __init board_init(void) 
static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };



DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")

	.init_irq = init_irq,

	.init_irq = irqchip_init,

	.timer = &timer,

	.init_machine = board_init,

	.dt_compat = bcm11351_dt_compat,

arch/arm/mach-exynos/common.c

+5 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/of_irq.h>

#include <linux/export.h>

#include <linux/irqdomain.h>

#include <linux/irqchip.h>

#include <linux/of_address.h>



#include <asm/proc-fns.h>
@@ -644,8 +645,6 @@ static int __init combiner_of_init(struct device_node *np, 
}



static const struct of_device_id exynos_dt_irq_match[] = {

	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },

	{ .compatible = "arm,cortex-a15-gic", .data = gic_of_init, },

	{ .compatible = "samsung,exynos4210-combiner",

			.data = combiner_of_init, },

	{},
@@ -661,8 +660,10 @@ void __init exynos4_init_irq(void) 
	if (!of_have_populated_dt())

		gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset, NULL);

#ifdef CONFIG_OF

	else

	else {

		irqchip_init();

		of_irq_init(exynos_dt_irq_match);

	}

#endif



	if (!of_have_populated_dt())
@@ -679,6 +680,7 @@ void __init exynos4_init_irq(void) 
void __init exynos5_init_irq(void)

{

#ifdef CONFIG_OF

	irqchip_init();

	of_irq_init(exynos_dt_irq_match);

#endif

	/*

arch/arm/mach-highbank/highbank.c

+2 −8
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/irqdomain.h>

#include <linux/of.h>

#include <linux/of_irq.h>
@@ -32,7 +33,6 @@ 
#include <asm/smp_twd.h>

#include <asm/hardware/arm_timer.h>

#include <asm/hardware/timer-sp.h>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -66,12 +66,6 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr) 
			  HB_JUMP_TABLE_PHYS(cpu) + 15);

}



const static struct of_device_id irq_match[] = {

	{ .compatible = "arm,cortex-a15-gic", .data = gic_of_init, },

	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },

	{}

};



#ifdef CONFIG_CACHE_L2X0

static void highbank_l2x0_disable(void)

{
@@ -82,7 +76,7 @@ static void highbank_l2x0_disable(void) 


static void __init highbank_init_irq(void)

{

	of_irq_init(irq_match);

	irqchip_init();



	if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9"))

		highbank_scu_map_io();

arch/arm/mach-imx/mach-imx6q.c

+2 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/init.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>
@@ -29,7 +30,6 @@ 
#include <asm/cpuidle.h>

#include <asm/smp_twd.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/hardware/gic.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/system_misc.h>
@@ -221,17 +221,12 @@ static void __init imx6q_map_io(void) 
	imx6q_clock_map_io();

}



static const struct of_device_id imx6q_irq_match[] __initconst = {

	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },

	{ /* sentinel */ }

};



static void __init imx6q_init_irq(void)

{

	l2x0_of_init(0, ~0UL);

	imx_src_init();

	imx_gpc_init();

	of_irq_init(imx6q_irq_match);

	irqchip_init();

}



static void __init imx6q_timer_init(void)