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

Commit fffa0512 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx5: tzic_init_irq() can directly be .init_irq hook 



After i.MX51 supports DT only, tzic_init_irq() can figure out the
tzic_base on its own.  Thus, it can directly be .init_irq hook, and
mx51[53]_init_irq() can be saved.

Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent b674cf2f

arch/arm/mach-imx/common.h

+1 −3
Original line number Diff line number Diff line
@@ -37,15 +37,13 @@ void imx35_init_early(void); 
void imx51_init_early(void);

void imx53_init_early(void);

void mxc_init_irq(void __iomem *);

void tzic_init_irq(void __iomem *);

void tzic_init_irq(void);

void mx1_init_irq(void);

void mx21_init_irq(void);

void mx25_init_irq(void);

void mx27_init_irq(void);

void mx31_init_irq(void);

void mx35_init_irq(void);

void mx51_init_irq(void);

void mx53_init_irq(void);

void imx1_soc_init(void);

void imx21_soc_init(void);

void imx25_soc_init(void);

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static const char *imx50_dt_board_compat[] __initconst = { 


DT_MACHINE_START(IMX50_DT, "Freescale i.MX50 (Device Tree Support)")

	.map_io		= mx53_map_io,

	.init_irq	= mx53_init_irq,

	.init_irq	= tzic_init_irq,

	.init_machine	= imx50_dt_init,

	.dt_compat	= imx50_dt_board_compat,

	.restart	= mxc_restart,

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static const char *imx51_dt_board_compat[] __initconst = { 
DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)")

	.map_io		= mx51_map_io,

	.init_early	= imx51_init_early,

	.init_irq	= mx51_init_irq,

	.init_irq	= tzic_init_irq,

	.init_machine	= imx51_dt_init,

	.init_late	= imx51_init_late,

	.dt_compat	= imx51_dt_board_compat,

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static const char *imx53_dt_board_compat[] __initconst = { 
DT_MACHINE_START(IMX53_DT, "Freescale i.MX53 (Device Tree Support)")

	.map_io		= mx53_map_io,

	.init_early	= imx53_init_early,

	.init_irq	= mx53_init_irq,

	.init_irq	= tzic_init_irq,

	.init_machine	= imx53_dt_init,

	.init_late	= imx53_init_late,

	.dt_compat	= imx53_dt_board_compat,

arch/arm/mach-imx/mm-imx5.c

+0 −17
Original line number Diff line number Diff line
@@ -93,23 +93,6 @@ void __init imx53_init_early(void) 
	imx_src_init();

}



void __init mx51_init_irq(void)

{

	tzic_init_irq(MX51_IO_ADDRESS(MX51_TZIC_BASE_ADDR));

}



void __init mx53_init_irq(void)

{

	struct device_node *np;

	void __iomem *base;



	np = of_find_compatible_node(NULL, NULL, "fsl,imx53-tzic");

	base = of_iomap(np, 0);

	WARN_ON(!base);



	tzic_init_irq(base);

}



static struct sdma_platform_data imx51_sdma_pdata __initdata = {

	.fw_name = "sdma-imx51.bin",

};