]> git.baikalelectronics.ru Git - kernel.git/commitdiff
omap3: Zoom2/3: Update hsmmc board config params
authorMadhusudhan Chikkature <madhu.cr@ti.com>
Sat, 12 Dec 2009 00:16:37 +0000 (16:16 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 12 Dec 2009 00:16:37 +0000 (16:16 -0800)
Update the hsmmc zoom peripheral configuration to support:
Power saving mode
mmc2 8-bit support
Configure mmc2 as non removable

Signed-off-by: Madhusudhan Chikkature <madhu.cr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-zoom-peripherals.c

index 221a8e3dc9c58c89f3683318d538e86dcfc530bd..258794db488f53a49ca8c4aab56ec6da1f060631 100755 (executable)
@@ -152,14 +152,20 @@ static struct regulator_init_data zoom_vsim = {
 
 static struct twl4030_hsmmc_info mmc[] __initdata = {
        {
+               .name           = "external",
                .mmc            = 1,
                .wires          = 4,
                .gpio_wp        = -EINVAL,
+               .power_saving   = true,
        },
        {
+               .name           = "internal",
                .mmc            = 2,
-               .wires          = 4,
+               .wires          = 8,
+               .gpio_cd        = -EINVAL,
                .gpio_wp        = -EINVAL,
+               .nonremovable   = true,
+               .power_saving   = true,
        },
        {}      /* Terminator */
 };
@@ -167,11 +173,8 @@ static struct twl4030_hsmmc_info mmc[] __initdata = {
 static int zoom_twl_gpio_setup(struct device *dev,
                unsigned gpio, unsigned ngpio)
 {
-       /* gpio + 0 is "mmc0_cd" (input/IRQ),
-        * gpio + 1 is "mmc1_cd" (input/IRQ)
-        */
+       /* gpio + 0 is "mmc0_cd" (input/IRQ) */
        mmc[0].gpio_cd = gpio + 0;
-       mmc[1].gpio_cd = gpio + 1;
        twl4030_mmc_init(mmc);
 
        /* link regulators to MMC adapters ... we "know" the