From patchwork Mon Oct 11 16:37:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 67442 X-Patchwork-Delegate: brad.figg@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 86260B6F11 for ; Tue, 12 Oct 2010 03:37:42 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1P5LNZ-0004Vh-Rm; Mon, 11 Oct 2010 17:37:37 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1P5LNY-0004VV-H4 for kernel-team@lists.ubuntu.com; Mon, 11 Oct 2010 17:37:36 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1P5LNY-0002Ww-Fa for ; Mon, 11 Oct 2010 17:37:36 +0100 Received: from s0106002369de4dac.cg.shawcable.net ([70.73.24.112] helo=[192.168.1.100]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1P5LNY-000124-3R for kernel-team@lists.ubuntu.com; Mon, 11 Oct 2010 17:37:36 +0100 Subject: [Maverick SRU][PATCH 6/6] UBUNTU - ARM: igepv2: Remove VMMC2 regulator From: Mathieu Poirier To: kernel-team@lists.ubuntu.com Date: Mon, 11 Oct 2010 10:37:34 -0600 Message-ID: <1286815054.3125.37.camel@black> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com SRU Justification: Impact: This patch is part of a serie of fix for the IGEPv2 board. The VMMC2 regulator is configured but it's not used on the IGEP v2. Since the code is contained to the IGEPv2 board file, it will not impact other boards. Fix: The fix consist in remove the declaration and initialization code for the regulator. Testcase: There isn't any noticeable effect associated to this fix. >From 5d473820768e5a07531fb0ae66496fa7a4671c29 Mon Sep 17 00:00:00 2001 From: Enric Balletbo i Serra Date: Mon, 11 Oct 2010 10:15:08 -0600 Subject: [PATCH 6/6] UBUNTU - ARM: igepv2: Remove VMMC2 regulator VMMC2 regulator is configured but it's not used for the IGEP v2, so remove this regulator from board. This work was tested by the community and also been submitted here: http://marc.info/?l=linux-omap&m=128628965822062&w=2 BugLink: https://bugs.launchpad.net/bugs/654595 Signed-off-by: Enric Balletbo i Serra Signed-off-by: Mathieu J Poirier Signed-off-by: Lee Jones --- arch/arm/mach-omap2/board-igep0020.c | 26 +++----------------------- 1 files changed, 3 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 600a40a..fec7387 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c @@ -260,10 +260,6 @@ static struct regulator_consumer_supply igep2_vmmc1_supply = { .supply = "vmmc", }; -static struct regulator_consumer_supply igep2_vmmc2_supply = { - .supply = "vmmc", -}; - /* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */ static struct regulator_init_data igep2_vmmc1 = { .constraints = { @@ -279,21 +275,6 @@ static struct regulator_init_data igep2_vmmc1 = { .consumer_supplies = &igep2_vmmc1_supply, }; -/* VMMC2 for OMAP VDD_MMC2 (i/o) and MMC2 WIFI */ -static struct regulator_init_data igep2_vmmc2 = { - .constraints = { - .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 = &igep2_vmmc2_supply, -}; - static struct omap2_hsmmc_info mmc[] = { { .mmc = 1, @@ -390,11 +371,11 @@ static int igep2_twl_gpio_setup(struct device *dev, mmc[0].gpio_cd = gpio + 0; omap2_hsmmc_init(mmc); - /* link regulators to MMC adapters ... we "know" the + /* + * link regulators to MMC adapters ... we "know" the * regulators will be set up only *after* we return. - */ + */ igep2_vmmc1_supply.dev = mmc[0].dev; - igep2_vmmc2_supply.dev = mmc[1].dev; /* * REVISIT: need ehci-omap hooks for external VBUS @@ -536,7 +517,6 @@ static struct twl4030_platform_data igep2_twldata = { .codec = &igep2_codec_data, .gpio = &igep2_twl4030_gpio_pdata, .vmmc1 = &igep2_vmmc1, - .vmmc2 = &igep2_vmmc2, .vpll2 = &igep2_vpll2, };