diff options
-rwxr-xr-x | arch/arm/mach-omap2/board-zoom-peripherals.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 221a8e3dc9c5..258794db488f 100755 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
@@ -152,14 +152,20 @@ static struct regulator_init_data zoom_vsim = { | |||
152 | 152 | ||
153 | static struct twl4030_hsmmc_info mmc[] __initdata = { | 153 | static struct twl4030_hsmmc_info mmc[] __initdata = { |
154 | { | 154 | { |
155 | .name = "external", | ||
155 | .mmc = 1, | 156 | .mmc = 1, |
156 | .wires = 4, | 157 | .wires = 4, |
157 | .gpio_wp = -EINVAL, | 158 | .gpio_wp = -EINVAL, |
159 | .power_saving = true, | ||
158 | }, | 160 | }, |
159 | { | 161 | { |
162 | .name = "internal", | ||
160 | .mmc = 2, | 163 | .mmc = 2, |
161 | .wires = 4, | 164 | .wires = 8, |
165 | .gpio_cd = -EINVAL, | ||
162 | .gpio_wp = -EINVAL, | 166 | .gpio_wp = -EINVAL, |
167 | .nonremovable = true, | ||
168 | .power_saving = true, | ||
163 | }, | 169 | }, |
164 | {} /* Terminator */ | 170 | {} /* Terminator */ |
165 | }; | 171 | }; |
@@ -167,11 +173,8 @@ static struct twl4030_hsmmc_info mmc[] __initdata = { | |||
167 | static int zoom_twl_gpio_setup(struct device *dev, | 173 | static int zoom_twl_gpio_setup(struct device *dev, |
168 | unsigned gpio, unsigned ngpio) | 174 | unsigned gpio, unsigned ngpio) |
169 | { | 175 | { |
170 | /* gpio + 0 is "mmc0_cd" (input/IRQ), | 176 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ |
171 | * gpio + 1 is "mmc1_cd" (input/IRQ) | ||
172 | */ | ||
173 | mmc[0].gpio_cd = gpio + 0; | 177 | mmc[0].gpio_cd = gpio + 0; |
174 | mmc[1].gpio_cd = gpio + 1; | ||
175 | twl4030_mmc_init(mmc); | 178 | twl4030_mmc_init(mmc); |
176 | 179 | ||
177 | /* link regulators to MMC adapters ... we "know" the | 180 | /* link regulators to MMC adapters ... we "know" the |