1 files changed, 74 insertions, 50 deletions

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 5e035a58b809..0afa3011db0f 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 
 #include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
 #include <linux/i2c/twl.h>
 #include <linux/mmc/host.h>
 
@@ -136,16 +137,9 @@ static struct mtd_partition igep2_onenand_partitions[] = {
         },
 };
 
-static int igep2_onenand_setup(void __iomem *onenand_base, int freq)
-{
-       /* nothing is required to be setup for onenand as of now */
-       return 0;
-}
-
 static struct omap_onenand_platform_data igep2_onenand_data = {
         .parts = igep2_onenand_partitions,
         .nr_parts = ARRAY_SIZE(igep2_onenand_partitions),
-        .onenand_setup = igep2_onenand_setup,
         .dma_channel    = -1,   /* disable DMA in OMAP OneNAND driver */
 };
 
@@ -159,35 +153,34 @@ static struct platform_device igep2_onenand_device = {
 
 static void __init igep2_flash_init(void)
 {
-        u8              cs = 0;
-        u8              onenandcs = GPMC_CS_NUM + 1;
+        u8 cs = 0;
+        u8 onenandcs = GPMC_CS_NUM + 1;
 
-        while (cs < GPMC_CS_NUM) {
-                u32 ret = 0;
+        for (cs = 0; cs < GPMC_CS_NUM; cs++) {
+                u32 ret;
                 ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
 
                 /* Check if NAND/oneNAND is configured */
                 if ((ret & 0xC00) == 0x800)
                         /* NAND found */
-                        pr_err("IGEP v2: Unsupported NAND found\n");
+                        pr_err("IGEP2: Unsupported NAND found\n");
                 else {
                         ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7);
                         if ((ret & 0x3F) == (ONENAND_MAP >> 24))
                                 /* ONENAND found */
                                 onenandcs = cs;
                 }
-                cs++;
         }
+
         if (onenandcs > GPMC_CS_NUM) {
-                pr_err("IGEP v2: Unable to find configuration in GPMC\n");
+                pr_err("IGEP2: Unable to find configuration in GPMC\n");
                 return;
         }
 
-        if (onenandcs < GPMC_CS_NUM) {
-                igep2_onenand_data.cs = onenandcs;
-                if (platform_device_register(&igep2_onenand_device) < 0)
-                        pr_err("IGEP v2: Unable to register OneNAND device\n");
-        }
+        igep2_onenand_data.cs = onenandcs;
+
+        if (platform_device_register(&igep2_onenand_device) < 0)
+                pr_err("IGEP2: Unable to register OneNAND device\n");
 }
 
 #else
@@ -254,12 +247,8 @@ static inline void __init igep2_init_smsc911x(void)
 static inline void __init igep2_init_smsc911x(void) { }
 #endif
 
-static struct omap_board_config_kernel igep2_config[] __initdata = {
-};
-
-static struct regulator_consumer_supply igep2_vmmc1_supply = {
-        .supply         = "vmmc",
-};
+static struct regulator_consumer_supply igep2_vmmc1_supply =
+        REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0");
 
 /* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
 static struct regulator_init_data igep2_vmmc1 = {
@@ -276,6 +265,52 @@ static struct regulator_init_data igep2_vmmc1 = {
         .consumer_supplies      = &igep2_vmmc1_supply,
 };
 
+static struct regulator_consumer_supply igep2_vio_supply =
+        REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.1");
+
+static struct regulator_init_data igep2_vio = {
+        .constraints = {
+                .min_uV                 = 1800000,
+                .max_uV                 = 1800000,
+                .apply_uV               = 1,
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                        | REGULATOR_MODE_STANDBY,
+                .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE
+                                        | REGULATOR_CHANGE_MODE
+                                        | REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = 1,
+        .consumer_supplies      = &igep2_vio_supply,
+};
+
+static struct regulator_consumer_supply igep2_vmmc2_supply =
+        REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1");
+
+static struct regulator_init_data igep2_vmmc2 = {
+        .constraints            = {
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL,
+                .always_on              = 1,
+        },
+        .num_consumer_supplies  = 1,
+        .consumer_supplies      = &igep2_vmmc2_supply,
+};
+
+static struct fixed_voltage_config igep2_vwlan = {
+        .supply_name            = "vwlan",
+        .microvolts             = 3300000,
+        .gpio                   = -EINVAL,
+        .enabled_at_boot        = 1,
+        .init_data              = &igep2_vmmc2,
+};
+
+static struct platform_device igep2_vwlan_device = {
+        .name           = "reg-fixed-voltage",
+        .id             = 0,
+        .dev = {
+                .platform_data  = &igep2_vwlan,
+        },
+};
+
 static struct omap2_hsmmc_info mmc[] = {
         {
                 .mmc            = 1,
@@ -317,6 +352,7 @@ static struct gpio_led igep2_gpio_leds[] = {
                 .name                   = "gpio-led:green:d1",
                 .default_trigger        = "heartbeat",
                 .gpio                   = -EINVAL, /* gets replaced */
+                .active_low             = 1,
         },
 };
 
@@ -342,24 +378,21 @@ static void __init igep2_leds_init(void)
 static inline void igep2_leds_init(void)
 {
         if ((gpio_request(IGEP2_GPIO_LED0_RED, "gpio-led:red:d0") == 0) &&
-            (gpio_direction_output(IGEP2_GPIO_LED0_RED, 1) == 0)) {
+            (gpio_direction_output(IGEP2_GPIO_LED0_RED, 0) == 0))
                 gpio_export(IGEP2_GPIO_LED0_RED, 0);
-                gpio_set_value(IGEP2_GPIO_LED0_RED, 0);
-        } else
+        else
                 pr_warning("IGEP v2: Could not obtain gpio GPIO_LED0_RED\n");
 
         if ((gpio_request(IGEP2_GPIO_LED0_GREEN, "gpio-led:green:d0") == 0) &&
-            (gpio_direction_output(IGEP2_GPIO_LED0_GREEN, 1) == 0)) {
+            (gpio_direction_output(IGEP2_GPIO_LED0_GREEN, 0) == 0))
                 gpio_export(IGEP2_GPIO_LED0_GREEN, 0);
-                gpio_set_value(IGEP2_GPIO_LED0_GREEN, 0);
-        } else
+        else
                 pr_warning("IGEP v2: Could not obtain gpio GPIO_LED0_GREEN\n");
 
         if ((gpio_request(IGEP2_GPIO_LED1_RED, "gpio-led:red:d1") == 0) &&
-            (gpio_direction_output(IGEP2_GPIO_LED1_RED, 1) == 0)) {
+            (gpio_direction_output(IGEP2_GPIO_LED1_RED, 0) == 0))
                 gpio_export(IGEP2_GPIO_LED1_RED, 0);
-                gpio_set_value(IGEP2_GPIO_LED1_RED, 0);
-        } else
+        else
                 pr_warning("IGEP v2: Could not obtain gpio GPIO_LED1_RED\n");
 
 }
@@ -373,12 +406,6 @@ static int igep2_twl_gpio_setup(struct device *dev,
         omap2_hsmmc_init(mmc);
 
         /*
-         * link regulators to MMC adapters ... we "know" the
-         * regulators will be set up only *after* we return.
-         */
-        igep2_vmmc1_supply.dev = mmc[0].dev;
-
-        /*
          * REVISIT: need ehci-omap hooks for external VBUS
          * power switch and overcurrent detect
          */
@@ -397,10 +424,9 @@ static int igep2_twl_gpio_setup(struct device *dev,
         /* TWL4030_GPIO_MAX + 1 == ledB (out, active low LED) */
 #if !defined(CONFIG_LEDS_GPIO) && !defined(CONFIG_LEDS_GPIO_MODULE)
         if ((gpio_request(gpio+TWL4030_GPIO_MAX+1, "gpio-led:green:d1") == 0)
-            && (gpio_direction_output(gpio + TWL4030_GPIO_MAX + 1, 1) == 0)) {
+            && (gpio_direction_output(gpio + TWL4030_GPIO_MAX + 1, 1) == 0))
                 gpio_export(gpio + TWL4030_GPIO_MAX + 1, 0);
-                gpio_set_value(gpio + TWL4030_GPIO_MAX + 1, 0);
-        } else
+        else
                 pr_warning("IGEP v2: Could not obtain gpio GPIO_LED1_GREEN\n");
 #else
         igep2_gpio_leds[3].gpio = gpio + TWL4030_GPIO_MAX + 1;
@@ -489,15 +515,15 @@ static void __init igep2_display_init(void)
 
 static struct platform_device *igep2_devices[] __initdata = {
         &igep2_dss_device,
+        &igep2_vwlan_device,
 };
 
 static void __init igep2_init_irq(void)
 {
-        omap_board_config = igep2_config;
-        omap_board_config_size = ARRAY_SIZE(igep2_config);
-        omap2_init_common_hw(m65kxxxxam_sdrc_params, m65kxxxxam_sdrc_params);
+        omap2_init_common_infrastructure();
+        omap2_init_common_devices(m65kxxxxam_sdrc_params,
+                                  m65kxxxxam_sdrc_params);
         omap_init_irq();
-        omap_gpio_init();
 }
 
 static struct twl4030_codec_audio_data igep2_audio_data = {
@@ -519,7 +545,7 @@ static struct twl4030_platform_data igep2_twldata = {
         .gpio           = &igep2_twl4030_gpio_pdata,
         .vmmc1          = &igep2_vmmc1,
         .vpll2          = &igep2_vpll2,
-
+        .vio            = &igep2_vio,
 };
 
 static struct i2c_board_info __initdata igep2_i2c1_boardinfo[] = {
@@ -577,8 +603,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 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)