|
@@ -168,15 +168,10 @@ static void devkit8000_panel_disable_tv(struct omap_dss_device *dssdev)
|
|
|
{
|
|
|
}
|
|
|
|
|
|
-
|
|
|
static struct regulator_consumer_supply devkit8000_vmmc1_supply = {
|
|
|
.supply = "vmmc",
|
|
|
};
|
|
|
|
|
|
-static struct regulator_consumer_supply devkit8000_vsim_supply = {
|
|
|
- .supply = "vmmc_aux",
|
|
|
-};
|
|
|
-
|
|
|
/* ads7846 on SPI */
|
|
|
static struct regulator_consumer_supply devkit8000_vio_supplies[] = {
|
|
|
REGULATOR_SUPPLY("vcc", "spi2.0")
|
|
@@ -281,7 +276,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
|
|
|
|
|
|
/* link regulators to MMC adapters */
|
|
|
devkit8000_vmmc1_supply.dev = mmc[0].dev;
|
|
|
- devkit8000_vsim_supply.dev = mmc[0].dev;
|
|
|
|
|
|
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
|
|
|
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
|
|
@@ -334,21 +328,6 @@ static struct regulator_init_data devkit8000_vmmc1 = {
|
|
|
.consumer_supplies = &devkit8000_vmmc1_supply,
|
|
|
};
|
|
|
|
|
|
-/* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */
|
|
|
-static struct regulator_init_data devkit8000_vsim = {
|
|
|
- .constraints = {
|
|
|
- .min_uV = 1800000,
|
|
|
- .max_uV = 3000000,
|
|
|
- .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 = &devkit8000_vsim_supply,
|
|
|
-};
|
|
|
-
|
|
|
/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */
|
|
|
static struct regulator_init_data devkit8000_vdac = {
|
|
|
.constraints = {
|
|
@@ -414,7 +393,6 @@ static struct twl4030_platform_data devkit8000_twldata = {
|
|
|
.gpio = &devkit8000_gpio_data,
|
|
|
.codec = &devkit8000_codec_data,
|
|
|
.vmmc1 = &devkit8000_vmmc1,
|
|
|
- .vsim = &devkit8000_vsim,
|
|
|
.vdac = &devkit8000_vdac,
|
|
|
.vpll1 = &devkit8000_vpll1,
|
|
|
.vio = &devkit8000_vio,
|