Merge branch 'devel-gpio' into omap-for-linus

diff --combined arch/arm/mach-omap1/board-ams-delta.c
index dc82f3d028b584229bf4ef3a61b9b536340ca799,ce4d69ca15fea54a2e56199d42ec16312bc91311..e1439506eba9a088510189dafdb0ed33e414b708
--- 1/arch/arm/mach-omap1/board-ams-delta.c
--- 2/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@@ -141,7 -141,6 +141,6 @@@ static void __init ams_delta_init_irq(v
  {
        omap1_init_common_hw();
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static struct map_desc ams_delta_io_desc[] __initdata = {
@@@ -339,9 -338,6 +338,9 @@@ static int __init ams_delta_modem_init(
  {
        int err;
  
 +      if (!machine_is_ams_delta())
 +              return -ENODEV;
 +
        omap_cfg_reg(M14_1510_GPIO2);
        ams_delta_modem_ports[0].irq =
                        gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ);

diff --combined arch/arm/mach-omap1/board-voiceblue.c
index b2838bfeab867ae16d69f5c0cc91c36d48645b38,789f5bac73595655d255c04e2dbff195f8cb203f..815a69ce821de8907af64098c2e74527cc89fb5a
--- 1/arch/arm/mach-omap1/board-voiceblue.c
--- 2/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@@ -83,9 -83,6 +83,9 @@@ static struct platform_device serial_de
  
  static int __init ext_uart_init(void)
  {
 +      if (!machine_is_voiceblue())
 +              return -ENODEV;
 +
        return platform_device_register(&serial_device);
  }
  arch_initcall(ext_uart_init);
@@@ -161,7 -158,6 +161,6 @@@ static void __init voiceblue_init_irq(v
  {
        omap1_init_common_hw();
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static void __init voiceblue_init(void)
@@@ -239,9 -235,6 +238,9 @@@ static struct notifier_block panic_bloc
  
  static int __init voiceblue_setup(void)
  {
 +      if (!machine_is_voiceblue())
 +              return -ENODEV;
 +
        /* Setup panic notifier */
        atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
  

diff --combined arch/arm/mach-omap2/board-2430sdp.c
index ee7ac993a277db5199b9126df38bff8a554fea3b,0f14001c164198362246eee272fdd19ff4584988..c00f26aca0d6105678138501dfbb298fdda4a5e5
--- 1/arch/arm/mach-omap2/board-2430sdp.c
--- 2/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@@ -145,7 -145,6 +145,6 @@@ static void __init omap_2430sdp_init_ir
        omap_board_config_size = ARRAY_SIZE(sdp2430_config);
        omap2_init_common_hw(NULL, NULL);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static struct twl4030_gpio_platform_data sdp2430_gpio_data = {
@@@ -218,6 -217,8 +217,6 @@@ static struct omap_usb_config sdp2430_u
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static void __init omap_2430sdp_init(void)

diff --combined arch/arm/mach-omap2/board-3430sdp.c
index ad4cb262719ee69d224f4e4a9cf9bd92bfbab714,5cb23f3d4fc0dbb2576c72a9144734866bee03a4..869fb133c207f690d759035c4c1e7215256d5d71
--- 1/arch/arm/mach-omap2/board-3430sdp.c
--- 2/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -328,7 -328,6 +328,6 @@@ static void __init omap_3430sdp_init_ir
        omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
        omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static int sdp3430_batt_table[] = {
@@@ -663,6 -662,8 +662,6 @@@ static const struct ehci_hcd_omap_platf
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  /*

diff --combined arch/arm/mach-omap2/board-3630sdp.c
index 4cd96d70b9c7e6915ff0e0e0cb244bd66db6b1e3,b23f401aa6b6c0b34ba4a92f0f2ceb5187f29311..a8d35ba7781e3fe83d8d1f9d1fc83a28e8bb7edf
--- 1/arch/arm/mach-omap2/board-3630sdp.c
--- 2/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
@@@ -76,13 -76,14 +76,12 @@@ static void __init omap_sdp_init_irq(vo
        omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,
                        h8mbx00u0mer0em_sdrc_params);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  #ifdef CONFIG_OMAP_MUX
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  /*

diff --combined arch/arm/mach-omap2/board-am3517evm.c
index 63035d8231ef3d560a2f49f44efbefb3a52bfc72,df6900e8ad5a09d7897cb69efb1144c44bef5f14..86867138f1e43c823177ee17ac415abd73bad6ff
--- 1/arch/arm/mach-omap2/board-am3517evm.c
--- 2/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@@ -392,7 -392,6 +392,6 @@@ static void __init am3517_evm_init_irq(
  
        omap2_init_common_hw(NULL, NULL);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static struct omap_musb_board_data musb_board_data = {
@@@ -442,6 -441,8 +441,6 @@@ static struct omap_board_mux board_mux[
        OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  

diff --combined arch/arm/mach-omap2/board-apollon.c
index b01d6e422d7a1a5dc40ed1be2b6fb35b74070829,f51f4f1e07f788875e4a9731832f728096e44012..4e91f453ea90ebd1017b7f40f1556dfc8dcf30a3
--- 1/arch/arm/mach-omap2/board-apollon.c
--- 2/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@@ -280,8 -280,6 +280,6 @@@ static void __init omap_apollon_init_ir
        omap_board_config_size = ARRAY_SIZE(apollon_config);
        omap2_init_common_hw(NULL, NULL);
        omap_init_irq();
-       omap_gpio_init();
-       apollon_init_smc91x();
  }
  
  static void __init apollon_led_init(void)
@@@ -314,6 -312,8 +312,6 @@@ static void __init apollon_usb_init(voi
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static void __init omap_apollon_init(void)
@@@ -322,6 -322,7 +320,7 @@@
  
        omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC);
  
+       apollon_init_smc91x();
        apollon_led_init();
        apollon_flash_init();
        apollon_usb_init();

diff --combined arch/arm/mach-omap2/board-h4.c
index 263da1da181cd511d966f9cc849685557688a29f,68e6f4c8e00af2c4068871288f98f1c1c516b394..9ec77a4a6b883c1d3a7a9ef8189562df940052f7
--- 1/arch/arm/mach-omap2/board-h4.c
--- 2/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -293,7 -293,6 +293,6 @@@ static void __init omap_h4_init_irq(voi
        omap_board_config_size = ARRAY_SIZE(h4_config);
        omap2_init_common_hw(NULL, NULL);
        omap_init_irq();
-       omap_gpio_init();
        h4_init_flash();
  }
  
@@@ -321,6 -320,8 +320,6 @@@ static struct i2c_board_info __initdat
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static void __init omap_h4_init(void)

diff --combined arch/arm/mach-omap2/board-igep0020.c
index 6f8f9b4533f9425a3560f6d9297217168d657d52,3bda186fe6777d54413a5ed491534c8fa59de587..59b95f2389ddf376f80ff74950e07168e7f4cddf
--- 1/arch/arm/mach-omap2/board-igep0020.c
--- 2/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@@ -484,7 -484,6 +484,6 @@@ static void __init igep2_init_irq(void
  {
        omap2_init_common_hw(m65kxxxxam_sdrc_params, m65kxxxxam_sdrc_params);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static struct twl4030_codec_audio_data igep2_audio_data = {
@@@ -564,6 -563,8 +563,6 @@@ static const struct ehci_hcd_omap_platf
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  #if defined(CONFIG_LIBERTAS_SDIO) || defined(CONFIG_LIBERTAS_SDIO_MODULE)

diff --combined arch/arm/mach-omap2/board-igep0030.c
index 8dc6ed3aa377984f95904721ee6916f83a4b9c1c,c7c57cdf83d623978e8cdcaeedb6db03e3e19508..886f193a841503ca2073412fbbb37ad0ef926429
--- 1/arch/arm/mach-omap2/board-igep0030.c
--- 2/arch/arm/mach-omap2/board-igep0030.c
+++ b/arch/arm/mach-omap2/board-igep0030.c
@@@ -291,7 -291,6 +291,6 @@@ static void __init igep3_init_irq(void
  {
        omap2_init_common_hw(m65kxxxxam_sdrc_params, m65kxxxxam_sdrc_params);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static struct twl4030_platform_data igep3_twl4030_pdata = {
@@@ -366,6 -365,8 +365,6 @@@ void __init igep3_wifi_bt_init(void) {
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static void __init igep3_init(void)

diff --combined arch/arm/mach-omap2/board-ldp.c
index 84b4ea67d1565d5a787356a8cc0ef99ac22b04a9,d97e3caed7c0fc1e8e0ef0b40842dcc84a5f2be5..7455b0aadf86a3ab5612a59a12603f96039eb986
--- 1/arch/arm/mach-omap2/board-ldp.c
--- 2/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -294,8 -294,6 +294,6 @@@ static void __init omap_ldp_init_irq(vo
        omap_board_config_size = ARRAY_SIZE(ldp_config);
        omap2_init_common_hw(NULL, NULL);
        omap_init_irq();
-       omap_gpio_init();
-       ldp_init_smsc911x();
  }
  
  static struct twl4030_usb_data ldp_usb_data = {
@@@ -381,6 -379,8 +379,6 @@@ static struct platform_device *ldp_devi
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static struct omap_musb_board_data musb_board_data = {
@@@ -424,6 -424,7 +422,7 @@@ static struct mtd_partition ldp_nand_pa
  static void __init omap_ldp_init(void)
  {
        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
+       ldp_init_smsc911x();
        omap_i2c_init();
        platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices));
        ts_gpio = 54;

diff --combined arch/arm/mach-omap2/board-n8x0.c
index 0a4bc7715c3816cc504dd9da8727572d6aa138eb,d8a489338e0c2887ebb5100426b52ccbf1ab01c4..d4ce96316e3bc26621609497aae9d04572bc771f
--- 1/arch/arm/mach-omap2/board-n8x0.c
--- 2/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -184,15 -184,23 +184,15 @@@ static struct mtd_partition onenand_par
        },
  };
  
 -static struct omap_onenand_platform_data board_onenand_data = {
 -      .cs             = 0,
 -      .gpio_irq       = 26,
 -      .parts          = onenand_partitions,
 -      .nr_parts       = ARRAY_SIZE(onenand_partitions),
 -      .flags          = ONENAND_SYNC_READ,
 +static struct omap_onenand_platform_data board_onenand_data[] = {
 +      {
 +              .cs             = 0,
 +              .gpio_irq       = 26,
 +              .parts          = onenand_partitions,
 +              .nr_parts       = ARRAY_SIZE(onenand_partitions),
 +              .flags          = ONENAND_SYNC_READ,
 +      }
  };
 -
 -static void __init n8x0_onenand_init(void)
 -{
 -      gpmc_onenand_init(&board_onenand_data);
 -}
 -
 -#else
 -
 -static void __init n8x0_onenand_init(void) {}
 -
  #endif
  
  #if defined(CONFIG_MENELAUS) &&                                               \
@@@ -633,7 -641,6 +633,6 @@@ static void __init n8x0_init_irq(void
  {
        omap2_init_common_hw(NULL, NULL);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  #ifdef CONFIG_OMAP_MUX
@@@ -645,6 -652,8 +644,6 @@@ static struct omap_board_mux board_mux[
        OMAP2420_MUX(EAC_AC_DOUT, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static void __init n8x0_init_machine(void)
@@@ -661,7 -670,7 +660,7 @@@
                                        ARRAY_SIZE(n810_i2c_board_info_2));
  
        omap_serial_init();
 -      n8x0_onenand_init();
 +      gpmc_onenand_init(board_onenand_data);
        n8x0_mmc_init();
        n8x0_usb_init();
  }

diff --combined arch/arm/mach-omap2/board-omap3beagle.c
index d42c8c936053baf9052c3983665140a26de294b1,a4131bef50fbcee778c2dc5883376eb7bc983edb..f1a8edefa42f41f7bc6fe18b2f8e60bf776b76b5
--- 1/arch/arm/mach-omap2/board-omap3beagle.c
--- 2/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -490,7 -490,6 +490,6 @@@ static void __init omap3_beagle_init_ir
  #ifdef CONFIG_OMAP_32K_TIMER
        omap2_gp_clockevent_set_gptimer(12);
  #endif
-       omap_gpio_init();
  }
  
  static struct platform_device *omap3_beagle_devices[] __initdata = {
@@@ -548,6 -547,8 +547,6 @@@ static const struct ehci_hcd_omap_platf
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static struct omap_musb_board_data musb_board_data = {

diff --combined arch/arm/mach-omap2/board-omap3evm.c
index 8f1e69a9205663a91fd3ccc592cf2fca28a7537e,5ca02202d6086a6c42e380e54fc63b27d24a74d0..21ffc5c587a13d79a24c2e03a16c6c290c3725d9
--- 1/arch/arm/mach-omap2/board-omap3evm.c
--- 2/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@@ -625,7 -625,6 +625,6 @@@ static void __init omap3_evm_init_irq(v
        omap_board_config_size = ARRAY_SIZE(omap3_evm_config);
        omap2_init_common_hw(mt46h32m32lf6_sdrc_params, NULL);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static struct platform_device *omap3_evm_devices[] __initdata = {
@@@ -654,6 -653,8 +653,6 @@@ static struct omap_board_mux board_mux[
                                OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static struct omap_musb_board_data musb_board_data = {

diff --combined arch/arm/mach-omap2/board-omap3logic.c
index e2e9562f4de96ea4a766d73dcb0592a0bc44adaf,263294044c7eac8784ad45f91c38f4007afa1a15..cfd618d3bda81cfacf82310d76a9aa5bc55e209f
--- 1/arch/arm/mach-omap2/board-omap3logic.c
--- 2/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@@ -199,13 -199,14 +199,12 @@@ static void __init omap3logic_init_irq(
  {
        omap2_init_common_hw(NULL, NULL);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  #ifdef CONFIG_OMAP_MUX
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux       NULL
  #endif
  
  static void __init omap3logic_init(void)

diff --combined arch/arm/mach-omap2/board-omap3pandora.c
index 445b15843212d3824466bbd07496fe96ed86624a,1031d7cadb3a48d28a7f37dd4dd676869bb99487..de8df58b8f1d9d36d9e330e5094f6ad1e7b24f70
--- 1/arch/arm/mach-omap2/board-omap3pandora.c
--- 2/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -639,7 -639,6 +639,6 @@@ static void __init omap3pandora_init_ir
        omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
                             mt46h32m32lf6_sdrc_params);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static void pandora_wl1251_set_power(bool enable)
@@@ -711,6 -710,8 +710,6 @@@ static const struct ehci_hcd_omap_platf
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static struct omap_musb_board_data musb_board_data = {

diff --combined arch/arm/mach-omap2/board-omap3stalker.c
index ba65fe8a9e10de56f78f7197edc61fe7859b1918,ea13e2aeeec5824c11d28a2cf4b1be38a8bf4543..1af344b872bcd9144cab3eb9c38b7d67f02edc7e
--- 1/arch/arm/mach-omap2/board-omap3stalker.c
--- 2/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@@ -589,7 -589,6 +589,6 @@@ static void __init omap3_stalker_init_i
  #ifdef CONFIG_OMAP_32K_TIMER
        omap2_gp_clockevent_set_gptimer(12);
  #endif
-       omap_gpio_init();
  }
  
  static struct platform_device *omap3_stalker_devices[] __initdata = {
@@@ -616,6 -615,8 +615,6 @@@ static struct omap_board_mux board_mux[
                  OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
        {.reg_offset = OMAP_MUX_TERMINATOR},
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static struct omap_musb_board_data musb_board_data = {

diff --combined arch/arm/mach-omap2/board-omap3touchbook.c
index 8d530a607f850506cf5e3da46bea5092d28b4ac6,2339964058ccc2b8daa7670cc1b003ee13e2ebac..baa72c507d4ce3383c1da2b768915a28e6a43be9
--- 1/arch/arm/mach-omap2/board-omap3touchbook.c
--- 2/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@@ -413,6 -413,8 +413,6 @@@ static struct omap_board_config_kernel 
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static void __init omap3_touchbook_init_irq(void)
@@@ -426,7 -428,6 +426,6 @@@
  #ifdef CONFIG_OMAP_32K_TIMER
        omap2_gp_clockevent_set_gptimer(12);
  #endif
-       omap_gpio_init();
  }
  
  static struct platform_device *omap3_touchbook_devices[] __initdata = {

diff --combined arch/arm/mach-omap2/board-overo.c
index 133b5ead830d740951bf417581010ea2f275bb74,805b783933932b5951946e765d8cb252c4a511d7..b75bdcd47117cffca17dab3b58f3f981cdd51be8
--- 1/arch/arm/mach-omap2/board-overo.c
--- 2/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@@ -416,7 -416,6 +416,6 @@@ static void __init overo_init_irq(void
        omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
                             mt46h32m32lf6_sdrc_params);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  static struct platform_device *overo_devices[] __initdata = {
@@@ -438,6 -437,8 +437,6 @@@ static const struct ehci_hcd_omap_platf
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static struct omap_musb_board_data musb_board_data = {

diff --combined arch/arm/mach-omap2/board-rx51.c
index f3b6e103b01c499389ed3053dde71d92300491f0,1c3b0795c6e2aeb2e8f61dc551faa8d4e86271d7..6635142d7d072d574b98ba7ef53496ca153b4bf6
--- 1/arch/arm/mach-omap2/board-rx51.c
--- 2/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -108,7 -108,6 +108,6 @@@ static void __init rx51_init_irq(void
        sdrc_params = rx51_get_sdram_timings();
        omap2_init_common_hw(sdrc_params, sdrc_params);
        omap_init_irq();
-       omap_gpio_init();
  }
  
  extern void __init rx51_peripherals_init(void);
@@@ -117,6 -116,8 +116,6 @@@
  static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static struct omap_musb_board_data musb_board_data = {

diff --combined arch/arm/mach-omap2/board-zoom.c
index 27979fd527d39695e97ce35b6eb5e5bcb9d08acc,abd864a50b4eac026756681a6e488d2ee6452cbd..0dff9deaa8961cb1ff4714531bcfbe527b1c10e6
--- 1/arch/arm/mach-omap2/board-zoom.c
--- 2/arch/arm/mach-omap2/board-zoom.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@@ -43,7 -43,6 +43,6 @@@ static void __init omap_zoom_init_irq(v
                                h8mbx00u0mer0em_sdrc_params);
  
        omap_init_irq();
-       omap_gpio_init();
  }
  
  #ifdef CONFIG_OMAP_MUX
@@@ -63,6 -62,8 +62,6 @@@ static struct omap_board_mux board_mux[
        OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
        { .reg_offset = OMAP_MUX_TERMINATOR },
  };
 -#else
 -#define board_mux     NULL
  #endif
  
  static struct mtd_partition zoom_nand_partitions[] = {