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

Commit f451ca3e authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

ARM: davinci: cp-intc: add a wrapper around cp_intc_init() 



We're going to extend the cp_intc_init() function with a config
structure so we can drop the intc-related fields from davinci_soc_info.

Once we do it, we won't be able to use this routine directly as the
init_irq callback. Wrap the calls in additional helpers that don't
take parameters and can be assigned to init_irq.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent ed4d189b

arch/arm/mach-davinci/board-da830-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static void __init da830_evm_map_io(void) 
MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")

	.atag_offset	= 0x100,

	.map_io		= da830_evm_map_io,

	.init_irq	= cp_intc_init,

	.init_irq	= da830_init_irq,

	.init_time	= da830_init_time,

	.init_machine	= da830_evm_init,

	.init_late	= davinci_init_late,

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ static void __init da850_evm_map_io(void) 
MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")

	.atag_offset	= 0x100,

	.map_io		= da850_evm_map_io,

	.init_irq	= cp_intc_init,

	.init_irq	= da850_init_irq,

	.init_time	= da850_init_time,

	.init_machine	= da850_evm_init,

	.init_late	= davinci_init_late,

arch/arm/mach-davinci/board-mityomapl138.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static void __init mityomapl138_map_io(void) 
MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808")

	.atag_offset	= 0x100,

	.map_io		= mityomapl138_map_io,

	.init_irq	= cp_intc_init,

	.init_irq	= da850_init_irq,

	.init_time	= da850_init_time,

	.init_machine	= mityomapl138_init,

	.init_late	= davinci_init_late,

arch/arm/mach-davinci/board-omapl138-hawk.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static void __init omapl138_hawk_map_io(void) 
MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard")

	.atag_offset	= 0x100,

	.map_io		= omapl138_hawk_map_io,

	.init_irq	= cp_intc_init,

	.init_irq	= da850_init_irq,

	.init_time	= da850_init_time,

	.init_machine	= omapl138_hawk_init,

	.init_late	= davinci_init_late,

arch/arm/mach-davinci/da830.c

+5 −0
Original line number Diff line number Diff line
@@ -821,6 +821,11 @@ void __init da830_init(void) 
	WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module");

}



void __init da830_init_irq(void)

{

	cp_intc_init();

}



void __init da830_init_time(void)

{

	void __iomem *pll;