Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / arch / arm / mach-omap1 / board-nokia770.c

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 02789c5..6798b84 100644 (file)
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -38,21 +38,6 @@
 
 #define ADS7846_PENDOWN_GPIO   15
 
-static void __init omap_nokia770_init_irq(void)
-{
-       /* On Nokia 770, the SleepX signal is masked with an
-        * MPUIO line by default.  It has to be unmasked for it
-        * to become functional */
-
-       /* SleepX mask direction */
-       omap_writew((omap_readw(0xfffb5008) & ~2), 0xfffb5008);
-       /* Unmask SleepX signal */
-       omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004);
-
-       omap1_init_common_hw();
-       omap1_init_irq();
-}
-
 static const unsigned int nokia770_keymap[] = {
        KEY(1, 0, GROUP_0 | KEY_UP),
        KEY(2, 0, GROUP_1 | KEY_F5),
@@ -245,6 +230,15 @@ static inline void nokia770_mmc_init(void)
 
 static void __init omap_nokia770_init(void)
 {
+       /* On Nokia 770, the SleepX signal is masked with an
+        * MPUIO line by default.  It has to be unmasked for it
+        * to become functional */
+
+       /* SleepX mask direction */
+       omap_writew((omap_readw(0xfffb5008) & ~2), 0xfffb5008);
+       /* Unmask SleepX signal */
+       omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004);
+
        platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
        spi_register_board_info(nokia770_spi_board_info,
                                ARRAY_SIZE(nokia770_spi_board_info));
@@ -257,16 +251,12 @@ static void __init omap_nokia770_init(void)
        nokia770_mmc_init();
 }
 
-static void __init omap_nokia770_map_io(void)
-{
-       omap1_map_common_io();
-}
-
 MACHINE_START(NOKIA770, "Nokia 770")
        .atag_offset    = 0x100,
-       .map_io         = omap_nokia770_map_io,
+       .map_io         = omap16xx_map_io,
+       .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
-       .init_irq       = omap_nokia770_init_irq,
+       .init_irq       = omap1_init_irq,
        .init_machine   = omap_nokia770_init,
        .timer          = &omap1_timer,
 MACHINE_END