arm: tegra: tn8: fix camera regulators on tn8 with E1769
Kerwin Wan [Tue, 12 Nov 2013 08:44:31 +0000 (16:44 +0800)]
The power supply of cam_lv_1v2 is changed from ldo2 on E1736
to regen1 on E1769. The power supply of cam_1v8 is changed from
ldo6 on E1736 to an fixed regulator controlled by pmic gpio4 on E1769.

Change-Id: I9d6e4c0356dbf77f7fb8986ab14f21aa282f6316
Signed-off-by: Kerwin Wan <kerwinw@nvidia.com>
Reviewed-on: http://git-master/r/329501
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

arch/arm/boot/dts/tegra124-tn8b-generic.dtsi
arch/arm/boot/dts/tegra124-tn8b-power.dtsi

index 513da54..5908eea 100644 (file)
                        regulator-max-microvolt = <1800000>;
                        enable-active-high;
                        gpio = <&palmas_gpio 4 0>; /* PMIC GPIO4  */
+                       vin-supply = <&palmas_smps8>;
 
                        consumers {
                                c1 {
                                        regulator-consumer-device = "2-0030";
                                };
                                c9 {
+                                       regulator-consumer-supply = "vdd";
+                                       regulator-consumer-device = "2-004a";
+                               };
+                               c10 {
                                        regulator-consumer-supply = "vif";
                                        regulator-consumer-device = "2-0048";
                                };
                        };
                };
-               vdd_cam: regulator@9 {
-                       compatible = "regulator-fixed-sync";
-                       reg = <9>;
-                       regulator-name = "vdd-cam";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       enable-active-high;
-                       gpio = <&palmas_gpio 4 0>; /* PMIC GPIO4  */
-
-                       consumers {
-                               c1 {
-                                       regulator-consumer-supply = "vdd_cam_1v1_cam";
-                               };
-                               c2 {
-                                       regulator-consumer-supply = "imx135_reg2";
-                               };
-                               c3 {
-                                       regulator-consumer-supply = "vdd_1v2_cam";
-                               };
-                               c4 {
-                                       regulator-consumer-supply = "vdig";
-                                       regulator-consumer-device = "2-0010";
-                               };
-                               c5 {
-                                       regulator-consumer-supply = "dvdd";
-                                       regulator-consumer-device = "2-0010";
-                               };
-                               c6 {
-                                       regulator-consumer-supply = "vdig";
-                                       regulator-consumer-device = "2-0036";
-                               };
-                       };
-               };
        };
 /include/ "tegra124-tn8-emc.dtsi"
 };
index 025ca4a..c216154 100644 (file)
@@ -506,10 +506,6 @@ palmas: tps65913 {
                                                regulator-consumer-device = "2-0010";
                                        };
                                        c7 {
-                                               regulator-consumer-supply = "vana";
-                                               regulator-consumer-device = "2-0036";
-                                       };
-                                       c8 {
                                                regulator-consumer-supply = "avdd_ov5693";
                                                regulator-consumer-device = "2-0010";
                                        };
@@ -597,6 +593,22 @@ palmas: tps65913 {
                                                regulator-consumer-device = "2-000c";
                                        };
                                        c5 {
+                                               regulator-consumer-supply = "vdd_af1";
+                                               regulator-consumer-device = "2-0010";
+                                       };
+                                       c6 {
+                                               regulator-consumer-supply = "vin";
+                                               regulator-consumer-device = "2-0030";
+                                       };
+                                       c7 {
+                                               regulator-consumer-supply = "vin";
+                                               regulator-consumer-device = "2-004a";
+                                       };
+                                       c8 {
+                                               regulator-consumer-supply = "vana";
+                                               regulator-consumer-device = "2-0036";
+                                       };
+                                       c9 {
                                                regulator-consumer-supply = "vana";
                                                regulator-consumer-device = "2-0048";
                                        };
@@ -708,6 +720,7 @@ palmas: tps65913 {
                                regulator-name = "vdd-cam";
                                regulator-min-microvolt = <1050000>;
                                regulator-max-microvolt = <1200000>;
+                               vin-supply = <&palmas_smps8>;
 
                                consumers {
                                        c1 {
@@ -731,6 +744,10 @@ palmas: tps65913 {
                                                regulator-consumer-supply = "vdig";
                                                regulator-consumer-device = "2-0036";
                                        };
+                                       c7 {
+                                               regulator-consumer-supply = "vdig_lv";
+                                               regulator-consumer-device = "2-0010";
+                                       };
                                };
                        };
                };