From patchwork Sun Mar 8 19:44:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brownell X-Patchwork-Id: 10565 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 n28Jijwf028723 for ; Sun, 8 Mar 2009 19:44:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753126AbZCHToo (ORCPT ); Sun, 8 Mar 2009 15:44:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753196AbZCHToo (ORCPT ); Sun, 8 Mar 2009 15:44:44 -0400 Received: from smtp116.sbc.mail.sp1.yahoo.com ([69.147.64.89]:42581 "HELO smtp116.sbc.mail.sp1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753126AbZCHTon (ORCPT ); Sun, 8 Mar 2009 15:44:43 -0400 Received: (qmail 16164 invoked from network); 8 Mar 2009 19:44:41 -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:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-Disposition:Message-Id; b=gwzbDt4Y6iVo8ro3JKkQBlsKWIQ58+cEcrTg/ZIiAK11/RI08fqrxdtqc2PYbt/c6Opo47TqJCzxuDIDtXEDowvyA2OwxIEjoAVKr8g16u1GyH78AsQzgqRUpBwrmiW2VgbGZqEh0ptfvo0lprfxSjVDZbRxtn6gBNxAwYvg6bY= ; Received: from unknown (HELO pogo) (david-b@69.226.224.20 with plain) by smtp116.sbc.mail.sp1.yahoo.com with SMTP; 8 Mar 2009 19:44:40 -0000 X-YMail-OSG: xmCdzFUVM1kyRRo2DWb2H_QTYqDarpKBAqLPLlX9c5yqEF0tx9DZD4QpUccXYI5_OyedFk7s7HlnqdYs1Y6ISPGVE8FsEtDPdohqKmBg4Qc3QiZsEpkvnYMorniw6H6gcS.dZC94nJk4FrsUO9CGQvKaqv1plINvEUC8Oxu830zsYigpiY53f2lPj5v0xYXiJzwFW8Cco1sB2_0HnpnGaMGm2E1cZcTSozTlRA-- X-Yahoo-Newman-Property: ymail-3 From: David Brownell To: OMAP Subject: [patch 2.6.29-rc7-omap] omap3 boards list voltage ranges for VMMC1, VMMC2, VSIM Date: Sun, 8 Mar 2009 11:44:39 -0800 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200903081244.39744.david-b@pacbell.net> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: David Brownell It seems the regulator framework is going to require boards to explicitly configure voltage ranges, instead of letting them just pick up the entire available range. So this patch updates OMAP3 board handling for VMMC1, VMMC2, and VSIM. Also, change the label for the MMC1 DAT4..DAT7 supply to "vmmc_aux", so the label isn't specific to MMC1. Things like SDIO and eMMC chips may also need a second voltage, though in that case it's usually 1.8V for chip interface. Signed-off-by: David Brownell --- This should go with the patches headed to mainline too. arch/arm/mach-omap2/board-3430sdp.c | 26 +++++++++++++++----------- arch/arm/mach-omap2/board-omap3beagle.c | 26 +++++++++++++++----------- arch/arm/mach-omap2/board-overo.c | 12 +++++++----- 3 files changed, 37 insertions(+), 27 deletions(-) -- 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 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -335,7 +335,7 @@ static struct regulator_consumer_supply }; static struct regulator_consumer_supply sdp3430_vsim_supply = { - .supply = "vmmc_dat4..7", + .supply = "vmmc_aux", }; static struct regulator_consumer_supply sdp3430_vmmc2_supply = { @@ -528,11 +528,13 @@ static struct regulator_init_data sdp343 /* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */ static struct regulator_init_data sdp3430_vmmc1 = { .constraints = { - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE - | REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, + .min_uV = 1850000, + .max_uV = 3150000, + .valid_modes_mask = REGULATOR_MODE_NORMAL + | REGULATOR_MODE_STANDBY, + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE + | REGULATOR_CHANGE_MODE + | REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = 1, .consumer_supplies = &sdp3430_vmmc1_supply, @@ -556,11 +558,13 @@ static struct regulator_init_data sdp343 /* VSIM for OMAP VDD_MMC1A (i/o for DAT4..DAT7) */ static struct regulator_init_data sdp3430_vsim = { .constraints = { - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE - | REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, + .min_uV = 1800000, + .max_uV = 3000000, + .valid_modes_mask = REGULATOR_MODE_NORMAL + | REGULATOR_MODE_STANDBY, + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE + | REGULATOR_CHANGE_MODE + | REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = 1, .consumer_supplies = &sdp3430_vsim_supply, --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -131,7 +131,7 @@ static struct regulator_consumer_supply }; static struct regulator_consumer_supply beagle_vsim_supply = { - .supply = "vmmc_dat4..7", + .supply = "vmmc_aux", }; static struct gpio_led gpio_leds[]; @@ -179,11 +179,13 @@ static struct twl4030_gpio_platform_data /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ static struct regulator_init_data beagle_vmmc1 = { .constraints = { - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE - | REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, + .min_uV = 1850000, + .max_uV = 3150000, + .valid_modes_mask = REGULATOR_MODE_NORMAL + | REGULATOR_MODE_STANDBY, + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE + | REGULATOR_CHANGE_MODE + | REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = 1, .consumer_supplies = &beagle_vmmc1_supply, @@ -192,11 +194,13 @@ static struct regulator_init_data beagle /* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ static struct regulator_init_data beagle_vsim = { .constraints = { - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE - | REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, + .min_uV = 1800000, + .max_uV = 3000000, + .valid_modes_mask = REGULATOR_MODE_NORMAL + | REGULATOR_MODE_STANDBY, + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE + | REGULATOR_CHANGE_MODE + | REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = 1, .consumer_supplies = &beagle_vsim_supply, --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -279,11 +279,13 @@ static struct twl4030_usb_data overo_usb static struct regulator_init_data overo_vmmc1 = { .constraints = { - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE - | REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, + .min_uV = 1850000, + .max_uV = 3150000, + .valid_modes_mask = REGULATOR_MODE_NORMAL + | REGULATOR_MODE_STANDBY, + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE + | REGULATOR_CHANGE_MODE + | REGULATOR_CHANGE_STATUS, }, };