linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.infradead.org
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>
Subject: [PATCH 10/13] omap4: mmc: Fix the regulator resource for MMC2 on 4430sdp
Date: Wed, 07 Jul 2010 12:44:35 +0300	[thread overview]
Message-ID: <20100707094435.2562.27410.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100707094308.2562.91921.stgit@baageli.muru.com>

From: Santosh Shilimkar <santosh.shilimkar@ti.com>

The MMC1 and MMC2 cards have seperate LDO supplies. Current code assumes
that they are powered by same LDO.

This patch fixes the same and has VAUX1 as supply to MMC2 card.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Tested-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-4430sdp.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

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,
 };
 


  parent reply	other threads:[~2010-07-07  9:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-07  9:43 [PATCH 00/13] omap2/3/4 board updates for 2.6.36 merge window Tony Lindgren
2010-07-07  9:43 ` [PATCH 01/13] omap: zoom2: wlan board muxing Tony Lindgren
2010-07-07  9:44 ` [PATCH 02/13] omap: zoom3: " Tony Lindgren
2010-07-07  9:44 ` [PATCH 03/13] omap3: pandora: update gpio-keys data Tony Lindgren
2010-07-07  9:44 ` [PATCH 04/13] omap3: pandora: add NAND and wifi support Tony Lindgren
2010-07-07  9:44 ` [PATCH 05/13] omap: rx51: Set regulator V28 always on Tony Lindgren
2010-07-07  9:44 ` [PATCH 06/13] omap: rx51: Add platform_data for tlv320aic3x with reset gpionumber Tony Lindgren
2010-07-07  9:44 ` [PATCH 07/13] omap: rx51: Use REGULATOR_SUPPLY macro when initializingregulator consumers Tony Lindgren
2010-07-07  9:44 ` [PATCH 08/13] omap: rx51: Add supply and data for the tpa6130a2 headphoneamplifier Tony Lindgren
2010-07-07  9:44 ` [PATCH 09/13] tsl2563 ALS support for Nokia N900 Tony Lindgren
2010-07-08 13:01   ` Ameya Palande
2010-07-09  8:35     ` Tony Lindgren
2010-07-07  9:44 ` Tony Lindgren [this message]
2010-07-07  9:44 ` [PATCH 11/13] omap4: Board changes for 4430sdp tmp105 temperature sensor Tony Lindgren
2010-07-07  9:44 ` [PATCH 12/13] OMAP4: Add GPIO LED support for SDP board Tony Lindgren
2010-07-07  9:44 ` [PATCH 13/13] Add OMAP4 Panda Support Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100707094435.2562.27410.stgit@baageli.muru.com \
    --to=tony@atomide.com \
    --cc=kishore.kadiyala@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=rnayak@ti.com \
    --cc=s-ghorai@ti.com \
    --cc=santosh.shilimkar@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).