Re: [PATCH v3 8/9] omap: hsmmc: split mmc23 power control
flat view
From: Roger Quadros <hidden>
Date: 2010-08-11 08:30:29
Also in:
linux-arm-kernel, linux-mmc, linux-omap
Hi Ohad, On 08/11/2010 01:12 AM, ext Ohad Ben-Cohen wrote:
quoted hunk ↗ jump to hunk
Prepare for mmc3 regulator power control by splitting the power control functions of mmc2 and mmc3, and expecting mmc3 to have a single, dedicated, regulator support. Signed-off-by: Ohad Ben-Cohen<redacted> --- arch/arm/mach-omap2/hsmmc.c | 10 ++++-- drivers/mmc/host/omap_hsmmc.c | 67 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 66 insertions(+), 11 deletions(-)diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 1ef54b0..5d3d789 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c@@ -174,7 +174,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot, } } -static void hsmmc23_before_set_reg(struct device *dev, int slot, +static void hsmmc2_before_set_reg(struct device *dev, int slot, int power_on, int vdd) { struct omap_mmc_platform_data *mmc = dev->platform_data;@@ -325,14 +325,16 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) c->transceiver = 1; if (c->transceiver&& c->wires> 4) c->wires = 4; - /* FALLTHROUGH */ - case 3: if (mmc->slots[0].features& HSMMC_HAS_PBIAS) { /* off-chip level shifting, or none */ - mmc->slots[0].before_set_reg = hsmmc23_before_set_reg; + mmc->slots[0].before_set_reg = hsmmc2_before_set_reg; mmc->slots[0].after_set_reg = NULL; } break; + case 3: + mmc->slots[0].before_set_reg = NULL; + mmc->slots[0].after_set_reg = NULL; + break; default: pr_err("MMC%d configuration not supported!\n", c->mmc); kfree(mmc);diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index d50e917..6f5cea0 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c@@ -258,7 +258,7 @@ static int omap_hsmmc_1_set_power(struct device *dev, int slot, int power_on, return ret; } -static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on, +static int omap_hsmmc_2_set_power(struct device *dev, int slot, int power_on, int vdd) { struct omap_hsmmc_host *host =@@ -309,6 +309,31 @@ static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on, return ret; } +static int omap_hsmmc_3_set_power(struct device *dev, int slot, int power_on, + int vdd) +{ + struct omap_hsmmc_host *host = + platform_get_drvdata(to_platform_device(dev)); + int ret = 0; + + if (power_on) { + ret = mmc_regulator_set_ocr(host->vcc, vdd);
+ /* Enable interface voltage rail, if needed */
Why is this needed? In this case interface voltage rail seems to be the same as card supply. If you notice mmc_regulator_set_ocr code, it is doing the regulator enable, so don't need to enable it again below.
quoted hunk ↗ jump to hunk
+ if (ret == 0&& host->vcc) { + ret = regulator_enable(host->vcc); + if (ret< 0) + ret = mmc_regulator_set_ocr(host->vcc, 0); + } + } else { + if (host->vcc) + ret = regulator_disable(host->vcc); + if (ret == 0) + ret = mmc_regulator_set_ocr(host->vcc, 0); + } + + return ret; +}
All This can be replaced to the following to simply
if (power_on) {
return mmc_regulator_set_ocr(host->vcc, vdd);
else
return mmc_regulator_set_ocr(host->vcc, 0);
regards,
-roger