From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ulf Hansson Subject: Re: [PATCH v4] mmc: add a function to get regulators, supplying card's power Date: Wed, 13 Jun 2012 10:22:02 +0200 Message-ID: <4FD84DAA.30201@stericsson.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from eu1sys200aog102.obsmtp.com ([207.126.144.113]:48868 "EHLO eu1sys200aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751362Ab2FMIWg (ORCPT ); Wed, 13 Jun 2012 04:22:36 -0400 In-Reply-To: Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Guennadi Liakhovetski Cc: "linux-mmc@vger.kernel.org" , "linux-sh@vger.kernel.org" , Adrian Hunter , Philip Rakity , Ulf Hansson , Chris Ball , Magnus Damm , Mark Brown Hi Guennadi, On 06/12/2012 05:57 PM, Guennadi Liakhovetski wrote: > Add a function to get regulators, supplying card's Vdd and Vccq on a > specific host. If a Vdd supplying regulator is found, the function checks, > whether a valid OCR mask can be obtained from it. The Vccq regulator is > optional. A failure to get it is not fatal. > > Signed-off-by: Guennadi Liakhovetski > --- > > v4: > > 1. add _GPL to EXPORT_SYMBOL (note: a recently posted patch changes > another occurrence of EXPORT_SYMBOL too, so, this patch will apply with a > fuzz, if merged after) > > 2. add an optional vqmmc regulator, which also changes the function > prototype > > 3. print a warning, if failed to get an OCR mask > > Thanks to all, who commented > > drivers/mmc/core/core.c | 27 +++++++++++++++++++++++++++ > include/linux/mmc/host.h | 12 ++++++++++++ > 2 files changed, 39 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c > index 0b6141d..d77a238 100644 > --- a/drivers/mmc/core/core.c > +++ b/drivers/mmc/core/core.c > @@ -1013,6 +1013,33 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc, > } > EXPORT_SYMBOL(mmc_regulator_set_ocr); > > +int mmc_regulator_get_supply(struct mmc_host *mmc, struct mmc_supply *s) > +{ > + struct device *dev = mmc_dev(mmc); > + struct regulator *supply; > + int ret; > + > + if (!mmc || !s) > + return -EINVAL; > + > + supply = devm_regulator_get(dev, "vmmc"); > + > + if (IS_ERR(supply)) > + return PTR_ERR(supply); > + > + s->vmmc = supply; > + s->vqmmc = devm_regulator_get(dev, "vqmmc"); > + > + ret = mmc_regulator_get_ocrmask(supply); > + if (ret> 0) > + mmc->ocr_avail = ret; > + else > + dev_warn(mmc_dev(mmc), "Failed getting OCR mask: %d\n", ret); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(mmc_regulator_get_supply); > + > #endif /* CONFIG_REGULATOR */ > > /* > diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h > index 0707d22..3192335 100644 > --- a/include/linux/mmc/host.h > +++ b/include/linux/mmc/host.h > @@ -359,11 +359,17 @@ static inline void mmc_signal_sdio_irq(struct mmc_host *host) > > struct regulator; > > +struct mmc_supply { > + struct regulator *vmmc; /* Card power supply */ > + struct regulator *vqmmc; /* Optional Vccq supply */ > +}; I believe your intention is to provide this functionality for the host drivers as the common way of handling card regulators. Then, I would suggest to include these two new regulators in the mmc_host struct, instead of having this in a separate struct, which then also needs to be handled by every host driver. > + > #ifdef CONFIG_REGULATOR > int mmc_regulator_get_ocrmask(struct regulator *supply); > int mmc_regulator_set_ocr(struct mmc_host *mmc, > struct regulator *supply, > unsigned short vdd_bit); > +int mmc_regulator_get_supply(struct mmc_host *mmc, struct mmc_supply *s); > #else > static inline int mmc_regulator_get_ocrmask(struct regulator *supply) > { > @@ -376,6 +382,12 @@ static inline int mmc_regulator_set_ocr(struct mmc_host *mmc, > { > return 0; > } > + > +static inline int mmc_regulator_get_supply(struct mmc_host *mmc, > + struct mmc_supply *s) > +{ > + return 0; > +} > #endif > > int mmc_card_awake(struct mmc_host *host); Kind regards Ulf Hansson