From patchwork Sat Sep 25 18:19:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enric Balletbo Serra X-Patchwork-Id: 209172 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8PIJJ5T031732 for ; Sat, 25 Sep 2010 18:19:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756508Ab0IYSTZ (ORCPT ); Sat, 25 Sep 2010 14:19:25 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:42781 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756401Ab0IYSTY (ORCPT ); Sat, 25 Sep 2010 14:19:24 -0400 Received: by mail-wy0-f174.google.com with SMTP id 28so2805411wyb.19 for ; Sat, 25 Sep 2010 11:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=386JE8tqThee6DEDnv5kzHu7Ot2oaJnO7nzi9ClHB3A=; b=qojOxd5qk+A8GaqfBDsKTFD2FKMhL6wdBWcGKDVe6bxAey4K++Y55JDp8I9J/4rUji hVpoXpvDpDjWVLf+vZM7LtEhsnDbS34yUPDP0OlkyP6yXlGe/lIN71rkStWjUGZYscfG xWm0jwh22WPMzPGmrFVUgYlO8oXi0fWEsx7Co= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=rbjP91EkeNlJqUrkYHAnNJCVWVCGcTZysCQ/ybhPOqpI1V3amVHVkIoHf5yk1+ExPA Yei9/txAx4s52t//viAr5P4pRUtooMpQilEiV7wrt/f/C9FQsC6lRvAjXRNX5YUArXBR gJwytYtgAZlt4+fWroz3e4OdeexOcT8spSWwo= Received: by 10.216.28.80 with SMTP id f58mr3454263wea.94.1285438763974; Sat, 25 Sep 2010 11:19:23 -0700 (PDT) Received: from localhost.localdomain (192.Red-88-27-117.staticIP.rima-tde.net [88.27.117.192]) by mx.google.com with ESMTPS id w29sm2259049weq.42.2010.09.25.11.19.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 25 Sep 2010 11:19:23 -0700 (PDT) From: Enric Balletbo i Serra To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Cc: Enric Balletbo i Serra Subject: [PATCH 6/6] omap3: Remove VMMC2 regulator on IGEP v2 because it's not used. Date: Sat, 25 Sep 2010 20:19:06 +0200 Message-Id: <1285438746-7311-7-git-send-email-eballetbo@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1285438746-7311-1-git-send-email-eballetbo@gmail.com> References: <1285438746-7311-1-git-send-email-eballetbo@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 25 Sep 2010 18:19:26 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index c5eaa43..fa450b1 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 @@ -534,7 +515,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, };