|
@@ -126,6 +126,10 @@
|
|
#define OMAP_MMC_MAX_CLOCK 52000000
|
|
#define OMAP_MMC_MAX_CLOCK 52000000
|
|
#define DRIVER_NAME "omap_hsmmc"
|
|
#define DRIVER_NAME "omap_hsmmc"
|
|
|
|
|
|
|
|
+#define VDD_1V8 1800000 /* 180000 uV */
|
|
|
|
+#define VDD_3V0 3000000 /* 300000 uV */
|
|
|
|
+#define VDD_165_195 (ffs(MMC_VDD_165_195) - 1)
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* One controller can have multiple slots, like on some omap boards using
|
|
* One controller can have multiple slots, like on some omap boards using
|
|
* omap.c controller driver. Luckily this is not currently done on any known
|
|
* omap.c controller driver. Luckily this is not currently done on any known
|
|
@@ -164,6 +168,8 @@ struct omap_hsmmc_host {
|
|
*/
|
|
*/
|
|
struct regulator *vcc;
|
|
struct regulator *vcc;
|
|
struct regulator *vcc_aux;
|
|
struct regulator *vcc_aux;
|
|
|
|
+ struct regulator *pbias;
|
|
|
|
+ bool pbias_enabled;
|
|
int pbias_disable;
|
|
int pbias_disable;
|
|
void __iomem *base;
|
|
void __iomem *base;
|
|
resource_size_t mapbase;
|
|
resource_size_t mapbase;
|
|
@@ -277,6 +283,15 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
|
|
if (mmc_slot(host).before_set_reg)
|
|
if (mmc_slot(host).before_set_reg)
|
|
mmc_slot(host).before_set_reg(dev, slot, power_on, vdd);
|
|
mmc_slot(host).before_set_reg(dev, slot, power_on, vdd);
|
|
|
|
|
|
|
|
+ if (host->pbias) {
|
|
|
|
+ if (host->pbias_enabled == 1) {
|
|
|
|
+ ret = regulator_disable(host->pbias);
|
|
|
|
+ if (!ret)
|
|
|
|
+ host->pbias_enabled = 0;
|
|
|
|
+ }
|
|
|
|
+ regulator_set_voltage(host->pbias, VDD_3V0, VDD_3V0);
|
|
|
|
+ }
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* Assume Vcc regulator is used only to power the card ... OMAP
|
|
* Assume Vcc regulator is used only to power the card ... OMAP
|
|
* VDDS is used to power the pins, optionally with a transceiver to
|
|
* VDDS is used to power the pins, optionally with a transceiver to
|
|
@@ -311,9 +326,27 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (host->pbias) {
|
|
|
|
+ if (vdd <= VDD_165_195)
|
|
|
|
+ ret = regulator_set_voltage(host->pbias, VDD_1V8,
|
|
|
|
+ VDD_1V8);
|
|
|
|
+ else
|
|
|
|
+ ret = regulator_set_voltage(host->pbias, VDD_3V0,
|
|
|
|
+ VDD_3V0);
|
|
|
|
+ if (ret < 0)
|
|
|
|
+ goto error_set_power;
|
|
|
|
+
|
|
|
|
+ if (host->pbias_enabled == 0) {
|
|
|
|
+ ret = regulator_enable(host->pbias);
|
|
|
|
+ if (!ret)
|
|
|
|
+ host->pbias_enabled = 1;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
if (mmc_slot(host).after_set_reg)
|
|
if (mmc_slot(host).after_set_reg)
|
|
mmc_slot(host).after_set_reg(dev, slot, power_on, vdd);
|
|
mmc_slot(host).after_set_reg(dev, slot, power_on, vdd);
|
|
|
|
|
|
|
|
+error_set_power:
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -347,6 +380,9 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
|
|
reg = devm_regulator_get_optional(host->dev, "vmmc_aux");
|
|
reg = devm_regulator_get_optional(host->dev, "vmmc_aux");
|
|
host->vcc_aux = IS_ERR(reg) ? NULL : reg;
|
|
host->vcc_aux = IS_ERR(reg) ? NULL : reg;
|
|
|
|
|
|
|
|
+ reg = devm_regulator_get_optional(host->dev, "pbias");
|
|
|
|
+ host->pbias = IS_ERR(reg) ? NULL : reg;
|
|
|
|
+
|
|
/* For eMMC do not power off when not in sleep state */
|
|
/* For eMMC do not power off when not in sleep state */
|
|
if (mmc_slot(host).no_regulator_off_init)
|
|
if (mmc_slot(host).no_regulator_off_init)
|
|
return 0;
|
|
return 0;
|
|
@@ -1831,6 +1867,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
|
|
host->base = ioremap(host->mapbase, SZ_4K);
|
|
host->base = ioremap(host->mapbase, SZ_4K);
|
|
host->power_mode = MMC_POWER_OFF;
|
|
host->power_mode = MMC_POWER_OFF;
|
|
host->next_data.cookie = 1;
|
|
host->next_data.cookie = 1;
|
|
|
|
+ host->pbias_enabled = 0;
|
|
|
|
|
|
platform_set_drvdata(pdev, host);
|
|
platform_set_drvdata(pdev, host);
|
|
|
|
|