ARM: OMAP1: Use generic map_io, init_early and init_irq

This allows removing omap hacks for map_io allowing generic
map_io.

Note that in the future we can't do cpu_is_omapxxxx detection
until in init_early. This means that board-innovator.c now
assumes 15xx only, and board-generic.c assumes 16xx only.
This is best fixed later on by passing the SoC type from
device tree.

Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 3 insertions, 13 deletions

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index b08a2138077..562986e1874 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -279,12 +279,6 @@ static void __init osk_init_cf(void)
         irq_set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_FALLING);
 }
 
-static void __init osk_init_irq(void)
-{
-        omap1_init_common_hw();
-        omap1_init_irq();
-}
-
 static struct omap_usb_config osk_usb_config __initdata = {
         /* has usb host connector (A) ... for development it can also
          * be used, with a NONSTANDARD gender-bending cable/dongle, as
@@ -576,17 +570,13 @@ static void __init osk_init(void)
         osk_mistral_init();
 }
 
-static void __init osk_map_io(void)
-{
-        omap1_map_common_io();
-}
-
 MACHINE_START(OMAP_OSK, "TI-OSK")
         /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
         .boot_params    = 0x10000100,
-        .map_io         = osk_map_io,
+        .map_io         = omap16xx_map_io,
+        .init_early     = omap1_init_early,
         .reserve        = omap_reserve,
-        .init_irq       = osk_init_irq,
+        .init_irq       = omap1_init_irq,
         .init_machine   = osk_init,
         .timer          = &omap1_timer,
 MACHINE_END