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

Commit e9c51558 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: spear: use common irqchip_init function 



Convert spear DT irq initialization over to use common irqchip_init
function.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: Rajeev Kumar <rajeev-dlh.kumar@st.com>
parent 44430ec0

arch/arm/mach-spear3xx/include/mach/generic.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ extern struct pl08x_platform_data pl080_plat_data; 
void __init spear_setup_of_timer(void);

void __init spear3xx_clk_init(void);

void __init spear3xx_map_io(void);

void __init spear3xx_dt_init_irq(void);



void spear_restart(char, const char *);

arch/arm/mach-spear3xx/spear300.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#define pr_fmt(fmt) "SPEAr300: " fmt



#include <linux/amba/pl08x.h>

#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <mach/generic.h>
@@ -211,7 +212,7 @@ static void __init spear300_map_io(void) 


DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree")

	.map_io		=	spear300_map_io,

	.init_irq	=	spear3xx_dt_init_irq,

	.init_irq	=	irqchip_init,

	.timer		=	&spear3xx_timer,

	.init_machine	=	spear300_dt_init,

	.restart	=	spear_restart,

arch/arm/mach-spear3xx/spear310.c

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/amba/pl08x.h>

#include <linux/amba/serial.h>

#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <mach/generic.h>
@@ -253,7 +254,7 @@ static void __init spear310_map_io(void) 


DT_MACHINE_START(SPEAR310_DT, "ST SPEAr310 SoC with Flattened Device Tree")

	.map_io		=	spear310_map_io,

	.init_irq	=	spear3xx_dt_init_irq,

	.init_irq	=	irqchip_init,

	.timer		=	&spear3xx_timer,

	.init_machine	=	spear310_dt_init,

	.restart	=	spear_restart,

arch/arm/mach-spear3xx/spear320.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/amba/pl022.h>

#include <linux/amba/pl08x.h>

#include <linux/amba/serial.h>

#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <mach/generic.h>
@@ -267,7 +268,7 @@ static void __init spear320_map_io(void) 


DT_MACHINE_START(SPEAR320_DT, "ST SPEAr320 SoC with Flattened Device Tree")

	.map_io		=	spear320_map_io,

	.init_irq	=	spear3xx_dt_init_irq,

	.init_irq	=	irqchip_init,

	.timer		=	&spear3xx_timer,

	.init_machine	=	spear320_dt_init,

	.restart	=	spear_restart,

arch/arm/mach-spear3xx/spear3xx.c

+0 −16
Original line number Diff line number Diff line
@@ -15,11 +15,8 @@ 


#include <linux/amba/pl022.h>

#include <linux/amba/pl08x.h>

#include <linux/irqchip/spear-shirq.h>

#include <linux/of_irq.h>

#include <linux/io.h>

#include <asm/hardware/pl080.h>

#include <asm/hardware/vic.h>

#include <plat/pl080.h>

#include <mach/generic.h>

#include <mach/spear.h>
@@ -119,16 +116,3 @@ static void __init spear3xx_timer_init(void) 
struct sys_timer spear3xx_timer = {

	.init = spear3xx_timer_init,

};
 


static const struct of_device_id vic_of_match[] __initconst = {

	{ .compatible = "arm,pl190-vic", .data = vic_of_init, },

	{ .compatible = "st,spear300-shirq", .data = spear300_shirq_of_init, },

	{ .compatible = "st,spear310-shirq", .data = spear310_shirq_of_init, },

	{ .compatible = "st,spear320-shirq", .data = spear320_shirq_of_init, },

	{ /* Sentinel */ }

};



void __init spear3xx_dt_init_irq(void)

{

	of_irq_init(vic_of_match);

}