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-h2.c b/arch/arm/mach-omap1/board-h2.c
index cb7fb1aa3dca..248a5b8e2865 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -373,12 +373,6 @@ static struct i2c_board_info __initdata h2_i2c_board_info[] = {
         },
 };
 
-static void __init h2_init_irq(void)
-{
-        omap1_init_common_hw();
-        omap1_init_irq();
-}
-
 static struct omap_usb_config h2_usb_config __initdata = {
         /* usb1 has a Mini-AB port and external isp1301 transceiver */
         .otg            = 2,
@@ -454,17 +448,13 @@ static void __init h2_init(void)
         h2_mmc_init();
 }
 
-static void __init h2_map_io(void)
-{
-        omap1_map_common_io();
-}
-
 MACHINE_START(OMAP_H2, "TI-H2")
         /* Maintainer: Imre Deak <imre.deak@nokia.com> */
         .boot_params    = 0x10000100,
-        .map_io         = h2_map_io,
+        .map_io         = omap16xx_map_io,
+        .init_early     = omap1_init_early,
         .reserve        = omap_reserve,
-        .init_irq       = h2_init_irq,
+        .init_irq       = omap1_init_irq,
         .init_machine   = h2_init,
         .timer          = &omap1_timer,
 MACHINE_END