arm: tegra: dalmore: correct arguments for comms regulator_get api calls
Nagarjuna Kristam [Fri, 26 Oct 2012 08:27:28 +0000 (13:27 +0530)]
Bug 1158679

Change-Id: If398bb4f3737efd78fb771d4535e08b3ad46341d
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
Reviewed-on: http://git-master/r/147880
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

arch/arm/mach-tegra/board-dalmore-power.c
arch/arm/mach-tegra/board-dalmore-sdhci.c

index f87e424..d881337 100644 (file)
@@ -112,9 +112,9 @@ static struct regulator_consumer_supply tps65090_fet6_supply[] = {
 };
 
 static struct regulator_consumer_supply tps65090_fet7_supply[] = {
-       REGULATOR_SUPPLY("vdd_wifi_3v3", NULL),
-       REGULATOR_SUPPLY("vdd_gps_3v3", NULL),
-       REGULATOR_SUPPLY("vdd_bt_3v3", NULL),
+       REGULATOR_SUPPLY("vdd_wifi_3v3", "bcm4329_wlan.1"),
+       REGULATOR_SUPPLY("vdd_gps_3v3", "reg-userspace-consumer.2"),
+       REGULATOR_SUPPLY("vdd_bt_3v3", "reg-userspace-consumer.1"),
 };
 
 #define TPS65090_PDATA_INIT(_id, _name, _supply_reg,                   \
@@ -224,9 +224,9 @@ static struct regulator_consumer_supply max77663_sd2_supply[] = {
        REGULATOR_SUPPLY("vdd_spi_1v8", NULL),
        REGULATOR_SUPPLY("dvdd_lcd", NULL),
        REGULATOR_SUPPLY("vdd_com_1v8", NULL),
-       REGULATOR_SUPPLY("vddio_wifi_1v8", NULL),
-       REGULATOR_SUPPLY("vdd_gps_1v8", NULL),
-       REGULATOR_SUPPLY("vddio_bt_1v8", NULL),
+       REGULATOR_SUPPLY("vddio_wifi_1v8", "bcm4329_wlan.1"),
+       REGULATOR_SUPPLY("vdd_gps_1v8", "reg-userspace-consumer.2"),
+       REGULATOR_SUPPLY("vddio_bt_1v8", "reg-userspace-consumer.1"),
        REGULATOR_SUPPLY("vdd_dtv_1v8", NULL),
 };
 
index 38b2d00..e5d9ead 100644 (file)
@@ -228,14 +228,14 @@ static struct regulator *dalmore_vddio_com_1v8;
 #define DALMORE_VDD_WIFI_3V3 "vdd_wifi_3v3"
 #define DALMORE_VDD_WIFI_1V8 "vddio_wifi_1v8"
 
-
 static int dalmore_wifi_regulator_enable(void)
 {
        int ret = 0;
 
        /* Enable COM's vdd_com_3v3 regulator*/
        if (IS_ERR_OR_NULL(dalmore_vdd_com_3v3)) {
-               dalmore_vdd_com_3v3 = regulator_get(NULL, DALMORE_VDD_WIFI_3V3);
+               dalmore_vdd_com_3v3 = regulator_get(&dalmore_wifi_device.dev,
+                                                       DALMORE_VDD_WIFI_3V3);
                if (IS_ERR_OR_NULL(dalmore_vdd_com_3v3)) {
                        pr_err("Couldn't get regulator "
                                DALMORE_VDD_WIFI_3V3 "\n");
@@ -254,7 +254,7 @@ static int dalmore_wifi_regulator_enable(void)
 
        /* Enable COM's vddio_com_1v8 regulator*/
        if (IS_ERR_OR_NULL(dalmore_vddio_com_1v8)) {
-               dalmore_vddio_com_1v8 = regulator_get(NULL,
+               dalmore_vddio_com_1v8 = regulator_get(&dalmore_wifi_device.dev,
                        DALMORE_VDD_WIFI_1V8);
                if (IS_ERR_OR_NULL(dalmore_vddio_com_1v8)) {
                        pr_err("Couldn't get regulator "