|
@@ -182,7 +182,6 @@ struct omap_hsmmc_host {
|
|
|
struct clk *fclk;
|
|
|
struct clk *dbclk;
|
|
|
struct regulator *pbias;
|
|
|
- bool pbias_enabled;
|
|
|
void __iomem *base;
|
|
|
int vqmmc_enabled;
|
|
|
resource_size_t mapbase;
|
|
@@ -330,22 +329,20 @@ static int omap_hsmmc_set_pbias(struct omap_hsmmc_host *host, bool power_on,
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- if (host->pbias_enabled == 0) {
|
|
|
+ if (!regulator_is_enabled(host->pbias)) {
|
|
|
ret = regulator_enable(host->pbias);
|
|
|
if (ret) {
|
|
|
dev_err(host->dev, "pbias reg enable fail\n");
|
|
|
return ret;
|
|
|
}
|
|
|
- host->pbias_enabled = 1;
|
|
|
}
|
|
|
} else {
|
|
|
- if (host->pbias_enabled == 1) {
|
|
|
+ if (regulator_is_enabled(host->pbias)) {
|
|
|
ret = regulator_disable(host->pbias);
|
|
|
if (ret) {
|
|
|
dev_err(host->dev, "pbias reg disable fail\n");
|
|
|
return ret;
|
|
|
}
|
|
|
- host->pbias_enabled = 0;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2081,7 +2078,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
|
|
|
host->base = base + pdata->reg_offset;
|
|
|
host->power_mode = MMC_POWER_OFF;
|
|
|
host->next_data.cookie = 1;
|
|
|
- host->pbias_enabled = 0;
|
|
|
host->vqmmc_enabled = 0;
|
|
|
|
|
|
ret = omap_hsmmc_gpio_init(mmc, host, pdata);
|