diff mbox

[5/5] Regulator: Renaming the supplies used in MMC driver

Message ID 1257439189-29594-1-git-send-email-anuj.aggarwal@ti.com (mailing list archive)
State Awaiting Upstream, archived
Headers show

Commit Message

Aggarwal, Anuj Nov. 5, 2009, 4:39 p.m. UTC 
None
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index 3403914..af3b1be 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -109,9 +109,9 @@  static int twl_mmc_late_init(struct device *dev)
 
 			hsmmc[i].mmc = mmc;
 
-			reg = regulator_get(dev, "vmmc");
+			reg = regulator_get(dev, "mmc");
 			if (IS_ERR(reg)) {
-				dev_dbg(dev, "vmmc regulator missing\n");
+				dev_dbg(dev, "mmc regulator missing\n");
 				/* HACK: until fixed.c regulator is usable,
 				 * we don't require a main regulator
 				 * for MMC2 or MMC3
@@ -126,7 +126,7 @@  static int twl_mmc_late_init(struct device *dev)
 			mmc->slots[0].ocr_mask = mmc_regulator_get_ocrmask(reg);
 
 			/* allow an aux regulator */
-			reg = regulator_get(dev, "vmmc_aux");
+			reg = regulator_get(dev, "mmc_aux");
 			hsmmc[i].vcc_aux = IS_ERR(reg) ? NULL : reg;
 
 			/* UGLY HACK:  workaround regulator framework bugs.