ARM: OMAP1: Misc clean-up

This patch cleans up omap1 files to sync up with linux-omap tree:

- Remove omap-generic MMC config as it should be defined in board-*.c files
  instead of using board-generic.c
- New style I2C board_info from David Brownell <dbrownell@users.sourceforge.net>
- Init section fixes from Dirk Behme <dirk.behme@googlemail.com>

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

1 files changed, 9 insertions, 39 deletions

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 00b7623b9b0c..070345ee39a5 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -37,6 +37,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
+#include <asm/arch/gpio-switch.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/tc.h>
 #include <asm/arch/nand.h>
@@ -47,8 +48,6 @@
 #include <asm/arch/mcbsp.h>
 #include <asm/arch/omap-alsa.h>
 
-extern int omap_gpio_init(void);
-
 static int h2_keymap[] = {
         KEY(0, 0, KEY_LEFT),
         KEY(0, 1, KEY_RIGHT),
@@ -341,22 +340,6 @@ static struct platform_device *h2_devices[] __initdata = {
         &h2_mcbsp1_device,
 };
 
-#ifdef CONFIG_I2C_BOARDINFO
-static struct i2c_board_info __initdata h2_i2c_board_info[] = {
-        {
-                I2C_BOARD_INFO("tps65010", 0x48),
-                .type           = "tps65010",
-                .irq            = OMAP_GPIO_IRQ(58),
-        },
-        /* TODO when driver support is ready:
-         *  - isp1301 OTG transceiver
-         *  - optional ov9640 camera sensor at 0x30
-         *  - pcf9754 for aGPS control
-         *  - ... etc
-         */
-};
-#endif
-
 static void __init h2_init_smc91x(void)
 {
         if ((omap_request_gpio(0)) < 0) {
@@ -365,6 +348,14 @@ static void __init h2_init_smc91x(void)
         }
 }
 
+static struct i2c_board_info __initdata h2_i2c_board_info[] = {
+        {
+                I2C_BOARD_INFO("isp1301_omap", 0x2d),
+                .type           = "isp1301_omap",
+                .irq            = OMAP_GPIO_IRQ(2),
+        },
+};
+
 static void __init h2_init_irq(void)
 {
         omap1_init_common_hw();
@@ -461,11 +452,6 @@ static void __init h2_init(void)
         omap_register_i2c_bus(1, 100, h2_i2c_board_info,
                               ARRAY_SIZE(h2_i2c_board_info));
         h2_mmc_init();
-
-        /* irq for tps65010 chip */
-        omap_cfg_reg(W4_GPIO58);
-        if (gpio_request(58, "tps65010") == 0)
-                gpio_direction_input(58);
 }
 
 static void __init h2_map_io(void)
@@ -473,22 +459,6 @@ static void __init h2_map_io(void)
         omap1_map_common_io();
 }
 
-#ifdef CONFIG_TPS65010
-static int __init h2_tps_init(void)
-{
-        if (!machine_is_omap_h2())
-                return 0;
-
-        /* gpio3 for SD, gpio4 for VDD_DSP */
-        /* FIXME send power to DSP iff it's configured */
-
-        /* Enable LOW_PWR */
-        tps65010_set_low_pwr(ON);
-        return 0;
-}
-fs_initcall(h2_tps_init);
-#endif
-
 MACHINE_START(OMAP_H2, "TI-H2")
         /* Maintainer: Imre Deak <imre.deak@nokia.com> */
         .phys_io        = 0xfff00000,