diff options
author | Thomas Weber <weber@corscience.de> | 2010-07-05 10:04:41 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 10:04:41 -0400 |
commit | 612840bbd4eb75963fc7cfd4c1163c798adc8849 (patch) | |
tree | 7a30485c10097ee207a1daa545cb82fbff69504f /arch/arm/mach-omap2/board-devkit8000.c | |
parent | a7707a335acc58e307e6c4f1d5c596765199cda2 (diff) |
OMAP2: Devkit8000: Remove non existing vsim supply
The Devkit8000 uses the cost reduced variant tps65930 of the twl4030.
The TPS65930 only has vdd1, vdd2, vpll1, vio, vmmc1, vdac and vaux2.
vaux2 is not used on Devkit8000.
Signed-off-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
-rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 83f28aec32b9..4d6320a781af 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
@@ -168,15 +168,10 @@ static void devkit8000_panel_disable_tv(struct omap_dss_device *dssdev) | |||
168 | { | 168 | { |
169 | } | 169 | } |
170 | 170 | ||
171 | |||
172 | static struct regulator_consumer_supply devkit8000_vmmc1_supply = { | 171 | static struct regulator_consumer_supply devkit8000_vmmc1_supply = { |
173 | .supply = "vmmc", | 172 | .supply = "vmmc", |
174 | }; | 173 | }; |
175 | 174 | ||
176 | static struct regulator_consumer_supply devkit8000_vsim_supply = { | ||
177 | .supply = "vmmc_aux", | ||
178 | }; | ||
179 | |||
180 | /* ads7846 on SPI */ | 175 | /* ads7846 on SPI */ |
181 | static struct regulator_consumer_supply devkit8000_vio_supplies[] = { | 176 | static struct regulator_consumer_supply devkit8000_vio_supplies[] = { |
182 | REGULATOR_SUPPLY("vcc", "spi2.0") | 177 | REGULATOR_SUPPLY("vcc", "spi2.0") |
@@ -281,7 +276,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev, | |||
281 | 276 | ||
282 | /* link regulators to MMC adapters */ | 277 | /* link regulators to MMC adapters */ |
283 | devkit8000_vmmc1_supply.dev = mmc[0].dev; | 278 | devkit8000_vmmc1_supply.dev = mmc[0].dev; |
284 | devkit8000_vsim_supply.dev = mmc[0].dev; | ||
285 | 279 | ||
286 | /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ | 280 | /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ |
287 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; | 281 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; |
@@ -334,21 +328,6 @@ static struct regulator_init_data devkit8000_vmmc1 = { | |||
334 | .consumer_supplies = &devkit8000_vmmc1_supply, | 328 | .consumer_supplies = &devkit8000_vmmc1_supply, |
335 | }; | 329 | }; |
336 | 330 | ||
337 | /* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ | ||
338 | static struct regulator_init_data devkit8000_vsim = { | ||
339 | .constraints = { | ||
340 | .min_uV = 1800000, | ||
341 | .max_uV = 3000000, | ||
342 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
343 | | REGULATOR_MODE_STANDBY, | ||
344 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
345 | | REGULATOR_CHANGE_MODE | ||
346 | | REGULATOR_CHANGE_STATUS, | ||
347 | }, | ||
348 | .num_consumer_supplies = 1, | ||
349 | .consumer_supplies = &devkit8000_vsim_supply, | ||
350 | }; | ||
351 | |||
352 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ | 331 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ |
353 | static struct regulator_init_data devkit8000_vdac = { | 332 | static struct regulator_init_data devkit8000_vdac = { |
354 | .constraints = { | 333 | .constraints = { |
@@ -414,7 +393,6 @@ static struct twl4030_platform_data devkit8000_twldata = { | |||
414 | .gpio = &devkit8000_gpio_data, | 393 | .gpio = &devkit8000_gpio_data, |
415 | .codec = &devkit8000_codec_data, | 394 | .codec = &devkit8000_codec_data, |
416 | .vmmc1 = &devkit8000_vmmc1, | 395 | .vmmc1 = &devkit8000_vmmc1, |
417 | .vsim = &devkit8000_vsim, | ||
418 | .vdac = &devkit8000_vdac, | 396 | .vdac = &devkit8000_vdac, |
419 | .vpll1 = &devkit8000_vpll1, | 397 | .vpll1 = &devkit8000_vpll1, |
420 | .vio = &devkit8000_vio, | 398 | .vio = &devkit8000_vio, |