Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932669AbcCDJmC (ORCPT ); Fri, 4 Mar 2016 04:42:02 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:33796 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759742AbcCDJlx (ORCPT ); Fri, 4 Mar 2016 04:41:53 -0500 MIME-Version: 1.0 In-Reply-To: <1457000385-2317-2-git-send-email-drinkcat@chromium.org> References: <1457000385-2317-1-git-send-email-drinkcat@chromium.org> <1457000385-2317-2-git-send-email-drinkcat@chromium.org> Date: Fri, 4 Mar 2016 10:41:51 +0100 Message-ID: Subject: Re: [PATCH 2/2] mmc: mediatek: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch From: Ulf Hansson To: Nicolas Boichat Cc: Matthias Brugger , Chaotian Jing , Geert Uytterhoeven , linux-mmc , "linux-arm-kernel@lists.infradead.org" , linux-mediatek@lists.infradead.org, "linux-kernel@vger.kernel.org" , Doug Anderson Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2806 Lines: 69 On 3 March 2016 at 11:19, Nicolas Boichat wrote: > We've introduced a new helper in the MMC core: > mmc_regulator_set_vqmmc(). Let's use this in mtk-sd. 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-mediatek specific code in mtk-sd. > > Signed-off-by: Nicolas Boichat Thanks, applied for next! Kind regards Uffe > --- > > Similar to e0848f5d294c703917260a6228cc08b8be46c527 > mmc: dw_mmc: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch , > where I copied the commit message from. > > drivers/mmc/host/mtk-sd.c | 17 +++++------------ > 1 file changed, 5 insertions(+), 12 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index 07809f4..b17f30d 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -1021,26 +1021,19 @@ static void msdc_set_buswidth(struct msdc_host *host, u32 width) > static int msdc_ops_switch_volt(struct mmc_host *mmc, struct mmc_ios *ios) > { > struct msdc_host *host = mmc_priv(mmc); > - int min_uv, max_uv; > int ret = 0; > > if (!IS_ERR(mmc->supply.vqmmc)) { > - if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) { > - min_uv = 3300000; > - max_uv = 3300000; > - } else if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180) { > - min_uv = 1800000; > - max_uv = 1800000; > - } else { > + if (ios->signal_voltage != MMC_SIGNAL_VOLTAGE_330 && > + ios->signal_voltage != MMC_SIGNAL_VOLTAGE_180) { > dev_err(host->dev, "Unsupported signal voltage!\n"); > return -EINVAL; > } > > - ret = regulator_set_voltage(mmc->supply.vqmmc, min_uv, max_uv); > + ret = mmc_regulator_set_vqmmc(mmc, ios); > if (ret) { > - dev_dbg(host->dev, > - "Regulator set error %d: %d - %d\n", > - ret, min_uv, max_uv); > + dev_dbg(host->dev, "Regulator set error %d (%d)\n", > + ret, ios->signal_voltage); > } else { > /* Apply different pinctrl settings for different signal voltage */ > if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180) > -- > 2.7.0.rc3.207.g0ac5344 >