arm: tegra: roth: correcting the regulator name
Narayan Reddy [Thu, 15 Nov 2012 21:12:09 +0000 (13:12 -0800)]
Bug 1176686

Reviewed-on: http://git-master/r/164053
(cherry picked from commit beb551adbf3ca6be0e5851d788f92e34591b8085)
Change-Id: I07bea2ae8c9a0a429b1fcd249b996a8e2b141ade
Signed-off-by: Narayan Reddy <narayanr@nvidia.com>
Signed-off-by: Vikram Kanigiri <vkanigiri@nvidia.com>
Reviewed-on: http://git-master/r/164896
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>

arch/arm/mach-tegra/board-roth-sdhci.c

index 82dbc46..e85a73d 100644 (file)
@@ -224,8 +224,8 @@ static int roth_wifi_set_carddetect(int val)
 
 static struct regulator *roth_vdd_com_3v3;
 static struct regulator *roth_vddio_com_1v8;
-#define ROTH_VDD_WIFI_3V3 "vdd_wifi_3v3"
-#define ROTH_VDD_WIFI_1V8 "vddio_wifi_1v8"
+#define ROTH_VDD_WIFI_3V3 "vdd_wl_pa"
+#define ROTH_VDD_WIFI_1V8 "vddio"
 
 
 static int roth_wifi_regulator_enable(void)
@@ -234,7 +234,8 @@ static int roth_wifi_regulator_enable(void)
 
        /* Enable COM's vdd_com_3v3 regulator*/
        if (IS_ERR_OR_NULL(roth_vdd_com_3v3)) {
-               roth_vdd_com_3v3 = regulator_get(NULL, ROTH_VDD_WIFI_3V3);
+               roth_vdd_com_3v3 = regulator_get(&roth_wifi_device.dev,
+                                       ROTH_VDD_WIFI_3V3);
                if (IS_ERR_OR_NULL(roth_vdd_com_3v3)) {
                        pr_err("Couldn't get regulator "
                                ROTH_VDD_WIFI_3V3 "\n");
@@ -253,7 +254,7 @@ static int roth_wifi_regulator_enable(void)
 
        /* Enable COM's vddio_com_1v8 regulator*/
        if (IS_ERR_OR_NULL(roth_vddio_com_1v8)) {
-               roth_vddio_com_1v8 = regulator_get(NULL,
+               roth_vddio_com_1v8 = regulator_get(&roth_wifi_device.dev,
                        ROTH_VDD_WIFI_1V8);
                if (IS_ERR_OR_NULL(roth_vddio_com_1v8)) {
                        pr_err("Couldn't get regulator "