Commit be732460 authored by Tony Lindgren's avatar Tony Lindgren

ARM: OMAP2+: Remove custom init_irq for remaining boards

With SoC specific timers, board specific init_irq is
no longer needed. Earlier this was still needed to
initialize the gptimer12 on Beagle based boards.

Also convert board-h4.c to use omap2_init_irq accidentally
did not get converted earlier.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e990a406
...@@ -397,11 +397,6 @@ static struct platform_device keys_gpio = { ...@@ -397,11 +397,6 @@ static struct platform_device keys_gpio = {
}, },
}; };
static void __init devkit8000_init_irq(void)
{
omap3_init_irq();
}
#define OMAP_DM9000_BASE 0x2c000000 #define OMAP_DM9000_BASE 0x2c000000
static struct resource omap_dm9000_resources[] = { static struct resource omap_dm9000_resources[] = {
...@@ -665,7 +660,7 @@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000") ...@@ -665,7 +660,7 @@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000")
.reserve = omap_reserve, .reserve = omap_reserve,
.map_io = omap3_map_io, .map_io = omap3_map_io,
.init_early = omap35xx_init_early, .init_early = omap35xx_init_early,
.init_irq = devkit8000_init_irq, .init_irq = omap3_init_irq,
.init_machine = devkit8000_init, .init_machine = devkit8000_init,
.timer = &omap3_secure_timer, .timer = &omap3_secure_timer,
MACHINE_END MACHINE_END
...@@ -290,11 +290,6 @@ static struct omap_board_config_kernel h4_config[] __initdata = { ...@@ -290,11 +290,6 @@ static struct omap_board_config_kernel h4_config[] __initdata = {
{ OMAP_TAG_LCD, &h4_lcd_config }, { OMAP_TAG_LCD, &h4_lcd_config },
}; };
static void __init omap_h4_init_irq(void)
{
omap2_init_irq();
}
static struct at24_platform_data m24c01 = { static struct at24_platform_data m24c01 = {
.byte_len = SZ_1K / 8, .byte_len = SZ_1K / 8,
.page_size = 16, .page_size = 16,
...@@ -375,7 +370,7 @@ MACHINE_START(OMAP_H4, "OMAP2420 H4 board") ...@@ -375,7 +370,7 @@ MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
.reserve = omap_reserve, .reserve = omap_reserve,
.map_io = omap242x_map_io, .map_io = omap242x_map_io,
.init_early = omap2420_init_early, .init_early = omap2420_init_early,
.init_irq = omap_h4_init_irq, .init_irq = omap2_init_irq,
.init_machine = omap_h4_init, .init_machine = omap_h4_init,
.timer = &omap2_timer, .timer = &omap2_timer,
MACHINE_END MACHINE_END
...@@ -449,11 +449,6 @@ static void __init omap3_beagle_init_early(void) ...@@ -449,11 +449,6 @@ static void __init omap3_beagle_init_early(void)
omap2_init_common_infrastructure(); omap2_init_common_infrastructure();
} }
static void __init omap3_beagle_init_irq(void)
{
omap3_init_irq();
}
static struct platform_device *omap3_beagle_devices[] __initdata = { static struct platform_device *omap3_beagle_devices[] __initdata = {
&leds_gpio, &leds_gpio,
&keys_gpio, &keys_gpio,
...@@ -561,7 +556,7 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") ...@@ -561,7 +556,7 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
.reserve = omap_reserve, .reserve = omap_reserve,
.map_io = omap3_map_io, .map_io = omap3_map_io,
.init_early = omap3_beagle_init_early, .init_early = omap3_beagle_init_early,
.init_irq = omap3_beagle_init_irq, .init_irq = omap3_init_irq,
.init_machine = omap3_beagle_init, .init_machine = omap3_beagle_init,
.timer = &omap3_secure_timer, .timer = &omap3_secure_timer,
MACHINE_END MACHINE_END
...@@ -428,11 +428,6 @@ static int __init omap3_stalker_i2c_init(void) ...@@ -428,11 +428,6 @@ static int __init omap3_stalker_i2c_init(void)
static struct omap_board_config_kernel omap3_stalker_config[] __initdata = { static struct omap_board_config_kernel omap3_stalker_config[] __initdata = {
}; };
static void __init omap3_stalker_init_irq(void)
{
omap3_init_irq();
}
static struct platform_device *omap3_stalker_devices[] __initdata = { static struct platform_device *omap3_stalker_devices[] __initdata = {
&keys_gpio, &keys_gpio,
}; };
...@@ -492,7 +487,7 @@ MACHINE_START(SBC3530, "OMAP3 STALKER") ...@@ -492,7 +487,7 @@ MACHINE_START(SBC3530, "OMAP3 STALKER")
.boot_params = 0x80000100, .boot_params = 0x80000100,
.map_io = omap3_map_io, .map_io = omap3_map_io,
.init_early = omap35xx_init_early, .init_early = omap35xx_init_early,
.init_irq = omap3_stalker_init_irq, .init_irq = omap3_init_irq,
.init_machine = omap3_stalker_init, .init_machine = omap3_stalker_init,
.timer = &omap3_secure_timer, .timer = &omap3_secure_timer,
MACHINE_END MACHINE_END
...@@ -326,11 +326,6 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -326,11 +326,6 @@ static struct omap_board_mux board_mux[] __initdata = {
}; };
#endif #endif
static void __init omap3_touchbook_init_irq(void)
{
omap3_init_irq();
}
static struct platform_device *omap3_touchbook_devices[] __initdata = { static struct platform_device *omap3_touchbook_devices[] __initdata = {
&omap3_touchbook_lcd_device, &omap3_touchbook_lcd_device,
&leds_gpio, &leds_gpio,
...@@ -403,7 +398,7 @@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board") ...@@ -403,7 +398,7 @@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board")
.reserve = omap_reserve, .reserve = omap_reserve,
.map_io = omap3_map_io, .map_io = omap3_map_io,
.init_early = omap3430_init_early, .init_early = omap3430_init_early,
.init_irq = omap3_touchbook_init_irq, .init_irq = omap3_init_irq,
.init_machine = omap3_touchbook_init, .init_machine = omap3_touchbook_init,
.timer = &omap3_secure_timer, .timer = &omap3_secure_timer,
MACHINE_END MACHINE_END
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment