b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -102,10 +102,6 @@ static struct regulator_consumer_supply zoom_vsim_supply = {
.supply = "vmmc_aux",
};
-static struct regulator_consumer_supply zoom_vmmc2_supply = {
- .supply = "vmmc",
-};
-
/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
static struct regulator_init_data zoom_vmmc1 = {
.constraints = {
@@ -121,21 +117,6 @@ static struct regulator_init_data zoom_vmmc1 = {
.consumer_supplies = &zoom_vmmc1_supply,
};
-/* VMMC2 for MMC2 card */
-static struct regulator_init_data zoom_vmmc2 = {
- .constraints = {
- .min_uV = 1850000,
- .max_uV = 1850000,
- .apply_uV = true,
- .valid_modes_mask = REGULATOR_MODE_NORMAL
- | REGULATOR_MODE_STANDBY,
- .valid_ops_mask = REGULATOR_CHANGE_MODE
- | REGULATOR_CHANGE_STATUS,
- },
- .num_consumer_supplies = 1,
- .consumer_supplies = &zoom_vmmc2_supply,
-};
-
/* VSIM for OMAP VDD_MMC1A (i/o for DAT4..DAT7) */
static struct regulator_init_data zoom_vsim = {
.constraints = {
@@ -159,15 +140,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
.gpio_wp = -EINVAL,
.power_saving = true,
},
- {
- .name = "internal",
- .mmc = 2,
- .wires = 8,
- .gpio_cd = -EINVAL,
- .gpio_wp = -EINVAL,
- .nonremovable = true,
- .power_saving = true,
- },
{} /* Terminator */
};
@@ -183,7 +155,6 @@ static int zoom_twl_gpio_setup(struct device *dev,
*/
zoom_vmmc1_supply.dev = mmc[0].dev;
zoom_vsim_supply.dev = mmc[0].dev;
- zoom_vmmc2_supply.dev = mmc[1].dev;
return 0;
}
@@ -241,7 +212,6 @@ static struct twl4030_platform_data zoom_twldata = {
.keypad = &zoom_kp_twl4030_data,
.codec = &zoom_codec_data,
.vmmc1 = &zoom_vmmc1,
- .vmmc2 = &zoom_vmmc2,
.vsim = &zoom_vsim,
};