aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-4430sdp.c
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2010-08-02 06:18:03 -0400
committerTony Lindgren <tony@atomide.com>2010-08-02 06:18:03 -0400
commit5026391c2ade39cdce93f6d6817ae5782f63a702 (patch)
tree87d93e7ad77ba7f02a5a726d33b41b4746a2b4e3 /arch/arm/mach-omap2/board-4430sdp.c
parent70b5d7377ec8640d5e5ff8c70da218fc20bef0c2 (diff)
omap4: mmc: Fix the regulator resource for MMC2 on 4430sdp
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-4430sdp.c')
-rw-r--r--arch/arm/mach-omap2/board-4430sdp.c12
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 e4a5d66b83b8..216870b44484 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[] = {
156 {} /* Terminator */ 156 {} /* Terminator */
157}; 157};
158 158
159static struct regulator_consumer_supply sdp4430_vmmc_supply[] = { 159static struct regulator_consumer_supply sdp4430_vaux_supply[] = {
160 { 160 {
161 .supply = "vmmc", 161 .supply = "vmmc",
162 .dev_name = "mmci-omap-hs.0", 162 .dev_name = "mmci-omap-hs.1",
163 }, 163 },
164};
165static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
164 { 166 {
165 .supply = "vmmc", 167 .supply = "vmmc",
166 .dev_name = "mmci-omap-hs.1", 168 .dev_name = "mmci-omap-hs.0",
167 }, 169 },
168}; 170};
169 171
@@ -210,6 +212,8 @@ static struct regulator_init_data sdp4430_vaux1 = {
210 | REGULATOR_CHANGE_MODE 212 | REGULATOR_CHANGE_MODE
211 | REGULATOR_CHANGE_STATUS, 213 | REGULATOR_CHANGE_STATUS,
212 }, 214 },
215 .num_consumer_supplies = 1,
216 .consumer_supplies = sdp4430_vaux_supply,
213}; 217};
214 218
215static struct regulator_init_data sdp4430_vaux2 = { 219static struct regulator_init_data sdp4430_vaux2 = {
@@ -250,7 +254,7 @@ static struct regulator_init_data sdp4430_vmmc = {
250 | REGULATOR_CHANGE_MODE 254 | REGULATOR_CHANGE_MODE
251 | REGULATOR_CHANGE_STATUS, 255 | REGULATOR_CHANGE_STATUS,
252 }, 256 },
253 .num_consumer_supplies = 2, 257 .num_consumer_supplies = 1,
254 .consumer_supplies = sdp4430_vmmc_supply, 258 .consumer_supplies = sdp4430_vmmc_supply,
255}; 259};
256 260