From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaehoon Chung Subject: Re: [PATCH v2 4/8] mmc: dw_mmc: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch Date: Thu, 08 Oct 2015 10:15:20 +0900 Message-ID: <5615C3A8.6070207@samsung.com> References: <1443622064-14362-1-git-send-email-heiko@sntech.de> <1443622064-14362-5-git-send-email-heiko@sntech.de> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from mailout2.samsung.com ([203.254.224.25]:38750 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbbJHBPX (ORCPT ); Wed, 7 Oct 2015 21:15:23 -0400 In-reply-to: <1443622064-14362-5-git-send-email-heiko@sntech.de> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Heiko Stuebner , ulf.hansson@linaro.org, mturquette@baylibre.com, sboyd@codeaurora.org Cc: linux-mmc@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, dianders@chromium.org, amstan@chromium.org Hi, Heiko. Acked-by: Jaehoon Chung Best Regards, Jaehoon Chung On 09/30/2015 11:07 PM, Heiko Stuebner wrote: > From: Douglas Anderson > > We've introduced a new helper in the MMC core: > mmc_regulator_set_vqmmc(). Let's use this in dw_mmc. Using this new > helper has some advantages: > > 1. We get the mmc_regulator_set_vqmmc() behavior of trying to match > VQMMC and VMMC when the signal voltage is 3.3V. This ensures max > compatibility. > > 2. We get rid of a few more warnings when probing unsupported > voltages. > > 3. We get rid of some non-dw_mmc specific code in dw_mmc. > > Signed-off-by: Douglas Anderson > Signed-off-by: Heiko Stuebner > --- > drivers/mmc/host/dw_mmc.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index fcbf552..b1b7e7f 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -1279,7 +1279,6 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) > const struct dw_mci_drv_data *drv_data = host->drv_data; > u32 uhs; > u32 v18 = SDMMC_UHS_18V << slot->id; > - int min_uv, max_uv; > int ret; > > if (drv_data && drv_data->switch_voltage) > @@ -1291,22 +1290,18 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) > * does no harm but you need to set the regulator directly. Try both. > */ > uhs = mci_readl(host, UHS_REG); > - if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) { > - min_uv = 2700000; > - max_uv = 3600000; > + if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) > uhs &= ~v18; > - } else { > - min_uv = 1700000; > - max_uv = 1950000; > + else > uhs |= v18; > - } > + > if (!IS_ERR(mmc->supply.vqmmc)) { > - ret = regulator_set_voltage(mmc->supply.vqmmc, min_uv, max_uv); > + ret = mmc_regulator_set_vqmmc(mmc, ios); > > if (ret) { > dev_dbg(&mmc->class_dev, > - "Regulator set error %d: %d - %d\n", > - ret, min_uv, max_uv); > + "Regulator set error %d - %s V\n", > + ret, uhs & v18 ? "1.8" : "3.3"); > return ret; > } > } >