From patchwork Wed Jul  7 09:44:35 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Tony Lindgren <tony@atomide.com>
X-Patchwork-Id: 110599
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o679iho5027917
	for <patchwork-omap@patchwork.kernel.org>;
	Wed, 7 Jul 2010 09:44:43 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754613Ab0GGJom (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Wed, 7 Jul 2010 05:44:42 -0400
Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:59247 "EHLO
	mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753498Ab0GGJol (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Wed, 7 Jul 2010 05:44:41 -0400
Received: from muru.com ([72.249.23.125] helo=baageli.muru.com)
	by mho-01-ewr.mailhop.org with esmtpa (Exim 4.68)
	(envelope-from <tony@atomide.com>)
	id 1OWRBG-000IKH-6D; Wed, 07 Jul 2010 09:44:41 +0000
X-Mail-Handler: MailHop Outbound by DynDNS
X-Originating-IP: 72.249.23.125
X-Report-Abuse-To: abuse@dyndns.com (see
	http://www.dyndns.com/services/mailhop/outbound_abuse.html
	for abuse reporting information)
X-MHO-User: U2FsdGVkX19wuyFEdXWREkQVr5tLHL1k
Subject: [PATCH 10/13] omap4: mmc: Fix the regulator resource for MMC2 on
	4430sdp
To: linux-arm-kernel@lists.infradead.org
From: Tony Lindgren <tony@atomide.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>, linux-omap@vger.kernel.org,
	Kishore Kadiyala <kishore.kadiyala@ti.com>,
	Rajendra Nayak <rnayak@ti.com>, Sukumar Ghorai <s-ghorai@ti.com>
Date: Wed, 07 Jul 2010 12:44:35 +0300
Message-ID: <20100707094435.2562.27410.stgit@baageli.muru.com>
In-Reply-To: <20100707094308.2562.91921.stgit@baageli.muru.com>
References: <20100707094308.2562.91921.stgit@baageli.muru.com>
User-Agent: StGit/0.15
MIME-Version: 1.0
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 07 Jul 2010 09:44:43 +0000 (UTC)


diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index e4a5d66..216870b 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -156,14 +156,16 @@ static struct omap2_hsmmc_info mmc[] = {
 	{}	/* Terminator */
 };
 
-static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
+static struct regulator_consumer_supply sdp4430_vaux_supply[] = {
 	{
 		.supply = "vmmc",
-		.dev_name = "mmci-omap-hs.0",
+		.dev_name = "mmci-omap-hs.1",
 	},
+};
+static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
 	{
 		.supply = "vmmc",
-		.dev_name = "mmci-omap-hs.1",
+		.dev_name = "mmci-omap-hs.0",
 	},
 };
 
@@ -210,6 +212,8 @@ static struct regulator_init_data sdp4430_vaux1 = {
 					| REGULATOR_CHANGE_MODE
 					| REGULATOR_CHANGE_STATUS,
 	},
+	.num_consumer_supplies  = 1,
+	.consumer_supplies      = sdp4430_vaux_supply,
 };
 
 static struct regulator_init_data sdp4430_vaux2 = {
@@ -250,7 +254,7 @@ static struct regulator_init_data sdp4430_vmmc = {
 					| REGULATOR_CHANGE_MODE
 					| REGULATOR_CHANGE_STATUS,
 	},
-	.num_consumer_supplies  = 2,
+	.num_consumer_supplies  = 1,
 	.consumer_supplies      = sdp4430_vmmc_supply,
 };