From patchwork Wed Mar 11 11:30:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brownell X-Patchwork-Id: 11113 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2BBUnWB020705 for ; Wed, 11 Mar 2009 11:30:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752378AbZCKLas (ORCPT ); Wed, 11 Mar 2009 07:30:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753590AbZCKLas (ORCPT ); Wed, 11 Mar 2009 07:30:48 -0400 Received: from smtp125.sbc.mail.sp1.yahoo.com ([69.147.65.184]:43077 "HELO smtp125.sbc.mail.sp1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752378AbZCKLar (ORCPT ); Wed, 11 Mar 2009 07:30:47 -0400 Received: (qmail 70880 invoked from network); 11 Mar 2009 11:30:45 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=pacbell.net; h=Received:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Subject:Date:User-Agent:Cc:References:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-Disposition:Message-Id; b=CLJ3L9xrhUXCEFe4uZC376shXcjTRnPAAm5RJCUuvwpLKDu4fwaGOCXSHnUpCXJAnVLdPoW4gB6e5hK3nq85AEHTz4qoiPU+vSydADfwF3fiPs9bivh5fll9v3NGOhvH4DYMfG163tqrDVJRTV0y2/DMHxnbsVavngHy7ILv+UE= ; Received: from unknown (HELO pogo) (david-b@69.226.224.20 with plain) by smtp125.sbc.mail.sp1.yahoo.com with SMTP; 11 Mar 2009 11:30:45 -0000 X-YMail-OSG: S4oSmGYVM1lIHR4dQY63OkGuvncCwzWV00bvJNFu48UWGaOpc0IxItalXZO97DA08aj43_bShhTVdu.Qer4fe0BrjlbgSV3jtShIq2SiG_PkI.QY4MS3CkOWagfGakB_bFBG6uxieVAVVFVOz81_X9a60VyAHLm6VezvsgZKno6JSPW.CijxJ76ynUU6RAH1s8k9prJ.8V.LGYPsTahhClprQ_8h4w-- X-Yahoo-Newman-Property: ymail-3 From: David Brownell To: Liam Girdwood Subject: Re: [patch 2.6.29-rc6+misc] MMC: regulator utilities Date: Wed, 11 Mar 2009 03:30:43 -0800 User-Agent: KMail/1.9.10 Cc: Pierre Ossman , Mark Brown , lkml , OMAP References: <200902081037.06645.david-b@pacbell.net> <20090308224907.62e9d9d5@mjolnir.ossman.eu> <1236599566.6781.87.camel@vega.slimlogic.co.uk> In-Reply-To: <1236599566.6781.87.camel@vega.slimlogic.co.uk> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200903110430.44198.david-b@pacbell.net> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org On Monday 09 March 2009, Liam Girdwood wrote: > > > From: David Brownell > > > > > > Glue between MMC and regulator stacks ... verified with > > > some OMAP3 boards using adjustable and configured-as-fixed > > > regulators on several MMC controllers. > > > > > > ... > > > > Acked-by: Pierre Ossman > > > > Applied. ... actually you applied an old version, not the one that was verified, with mmc_regulator_set_ocr() fixes and with Pierre's ACK. The comment is in your GIT tree is wrong, for starters... Please use this one instead. - Dave --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ========== CUT HERE From: David Brownell Glue between MMC and regulator stacks ... verified with some OMAP3 boards using adjustable and configured-as-fixed regulators on several MMC controllers. These calls are intended to be used by MMC host adapters using at least one regulator per host. Examples include slots with regulators supporting multiple voltages and ones using multiple voltage rails (e.g. DAT4..DAT7 using a separate supply, or a split rail chip like certain SDIO WLAN or eMMC solutions). Signed-off-by: David Brownell Acked-by: Pierre Ossman --- Changes since previous version: simplified set_ocr() calling convention, fixed an off-by-100mA error in that code, and don't set voltage on regulators that don't need (and may disallow) it. drivers/mmc/core/core.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/mmc/host.h | 5 ++ 2 files changed, 105 insertions(+) --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -523,6 +524,105 @@ u32 mmc_vddrange_to_ocrmask(int vdd_min, } EXPORT_SYMBOL(mmc_vddrange_to_ocrmask); +#ifdef CONFIG_REGULATOR + +/** + * mmc_regulator_get_ocrmask - return mask of supported voltages + * @supply: regulator to use + * + * This returns either a negative errno, or a mask of voltages that + * can be provided to MMC/SD/SDIO devices using the specified voltage + * regulator. This would normally be called before registering the + * MMC host adapter. + */ +int mmc_regulator_get_ocrmask(struct regulator *supply) +{ + int result = 0; + int count; + int i; + + count = regulator_count_voltages(supply); + if (count < 0) + return count; + + for (i = 0; i < count; i++) { + int vdd_uV; + int vdd_mV; + + vdd_uV = regulator_list_voltage(supply, i); + if (vdd_uV <= 0) + continue; + + vdd_mV = vdd_uV / 1000; + result |= mmc_vddrange_to_ocrmask(vdd_mV, vdd_mV); + } + + return result; +} +EXPORT_SYMBOL(mmc_regulator_get_ocrmask); + +/** + * mmc_regulator_set_ocr - set regulator to match host->ios voltage + * @vdd_bit: zero for power off, else a bit number (host->ios.vdd) + * @supply: regulator to use + * + * Returns zero on success, else negative errno. + * + * MMC host drivers may use this to enable or disable a regulator using + * a particular supply voltage. This would normally be called from the + * set_ios() method. + */ +int mmc_regulator_set_ocr(struct regulator *supply, unsigned short vdd_bit) +{ + int result = 0; + int min_uV, max_uV; + int enabled; + + enabled = regulator_is_enabled(supply); + if (enabled < 0) + return enabled; + + if (vdd_bit) { + int tmp; + int voltage; + + /* REVISIT mmc_vddrange_to_ocrmask() may have set some + * bits this regulator doesn't quite support ... don't + * be too picky, most cards and regulators are OK with + * a 0.1V range goof (it's a small error percentage). + */ + tmp = vdd_bit - ilog2(MMC_VDD_165_195); + if (tmp == 0) { + min_uV = 1650 * 1000; + max_uV = 1950 * 1000; + } else { + min_uV = 1900 * 1000 + tmp * 100 * 1000; + max_uV = min_uV + 100 * 1000; + } + + /* avoid needless changes to this voltage; the regulator + * might not allow this operation + */ + voltage = regulator_get_voltage(supply); + if (voltage < 0) + result = voltage; + else if (voltage < min_uV || voltage > max_uV) + result = regulator_set_voltage(supply, min_uV, max_uV); + else + result = 0; + + if (result == 0 && !enabled) + result = regulator_enable(supply); + } else if (enabled) { + result = regulator_disable(supply); + } + + return result; +} +EXPORT_SYMBOL(mmc_regulator_set_ocr); + +#endif + /* * Mask off any voltages we don't support and select * the lowest voltage --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -192,5 +192,10 @@ static inline void mmc_signal_sdio_irq(s wake_up_process(host->sdio_irq_thread); } +struct regulator; + +int mmc_regulator_get_ocrmask(struct regulator *supply); +int mmc_regulator_set_ocr(struct regulator *supply, unsigned short vdd_bit); + #endif