From patchwork Fri Oct 1 19:45:53 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: 224772 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 o91JkIDO010991 for ; Fri, 1 Oct 2010 19:46:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754464Ab0JATqS (ORCPT ); Fri, 1 Oct 2010 15:46:18 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:42595 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754285Ab0JATqR (ORCPT ); Fri, 1 Oct 2010 15:46:17 -0400 Received: by mail-ww0-f44.google.com with SMTP id 40so1814916wwj.1 for ; Fri, 01 Oct 2010 12:46:16 -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=GU69gkxPrsiIjDpQcv0/KTzNcIq6zTyGX32DQHyeFU4=; b=qOa6OzNNh4GbLHJO3OwDunDha4BpMhJZ/iics/YFoFYcf8v1M+Su5XOUMOZ7FznJLL bYRvYUfx2fEp5L5VlAbLOI7kd/YTF3/Q8V8LFEtyzXnI4jo80mEIXSPCvpRBWV5gX2Gi BMIMj7QQT4EAlNHXdn7bNPXMGuevXLowhVkNw= 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=wTnsx/HDkVxdDYC1nYiM5GxPwwuhm+6o+zTM+5irEVPp9nRE1Oz/cjPXVVMxakVW39 59aeqh7l3O4PylasXwB5j+4PqcrCQvAqu1eX3FoXm4K3VnWOEc1fIGzjp94DGqTiWfn9 bt9TBxW8o8Xl7GrGWmKfVcRaDXVRdTxLAxwQk= Received: by 10.216.234.93 with SMTP id r71mr2496736weq.104.1285962375775; Fri, 01 Oct 2010 12:46:15 -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 k46sm1057733weq.10.2010.10.01.12.46.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 01 Oct 2010 12:46:15 -0700 (PDT) From: Enric Balletbo i Serra To: linux-omap@vger.kernel.org Cc: Enric Balletbo i Serra Subject: [PATCHv2 6/6] omap3: Remove VMMC2 regulator on IGEP v2. Date: Fri, 1 Oct 2010 21:45:53 +0200 Message-Id: <1285962353-9586-7-git-send-email-eballetbo@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1285962353-9586-1-git-send-email-eballetbo@gmail.com> References: <1285962353-9586-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]); Fri, 01 Oct 2010 19:46:19 +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, };