Revert "arm64: jetson: update power tree for 4k eDP panel"

This reverts commit be1fb5dbe5554d0404e2edfd2b024e6c6af3e87e.

Bug 200129258

Change-Id: I9033e63feda3d66a1736df3c24220f5d15d08c0e
Signed-off-by: Kerwin Wan <kerwinw@nvidia.com>
Reviewed-on: http://git-master/r/779673
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-common-power-tree-p2530-0930-e03.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-common-power-tree-p2530-0930-e03.dtsi
index 2c2ec4cd7b5fc1c26568ea2f02379a5a72533d95..f70defb9e01dd693f03b72983202c69580037d79 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-common-power-tree-p2530-0930-e03.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-common-power-tree-p2530-0930-e03.dtsi
@@ -133,7 +133,6 @@
                };
 
                regulator@2 {
-                       regulator-always-on;
                        regulator-enable-ramp-delay = <240>;
                        regulator-disable-ramp-delay = <11340>;
                };
@@ -216,7 +215,6 @@
                        dvdd_lcd-supply = <&max77620_sd3>;
                        vdd_lcd_bl_en-supply = <&lcd_bl_en>;
                        vdd_lcd_bl-supply = <&vdd_3v3>;
-                       avdd_3v3_dp-supply = <&avdd_3v3_dp>;
                };
 
                /* tegradc.1 */

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-cv-power-tree-p2597-2180-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-cv-power-tree-p2597-2180-a00.dtsi
index c330c91692bd540df060fdee2deb1086408ece5b..51d73b55b45acb058d7a99668d257b81372f6e50 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-cv-power-tree-p2597-2180-a00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-cv-power-tree-p2597-2180-a00.dtsi
@@ -167,12 +167,6 @@
                        dvdd_lcd-supply = <&en_dvdd_disp_1v8>;
                        vdd_lcd_bl_en-supply = <&lcd_bl_en>;
                        vdd_lcd_bl-supply = <&vdd_3v3>;
-
-                       /*
-                        * Same as dvdd_lcd supply above. Solely used for matching
-                        * expected regulator name in edp panel files.
-                        */
-                       vdd_ds_1v8-supply = <&en_dvdd_disp_1v8>;
                };
 
                vi {

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-e-power-fixed-p2530-0930-e03.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-e-power-fixed-p2530-0930-e03.dtsi
index 1d894b52789edd1103dbd13fe61117bc9dd93caf..4d097d8b397c6b480838e0772a50ca0633ec033d 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-e-power-fixed-p2530-0930-e03.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-e-power-fixed-p2530-0930-e03.dtsi
@@ -181,21 +181,6 @@
                        };
                };
 
-               avdd_3v3_dp: regulator@100 {
-                       compatible = "regulator-fixed-sync";
-                       reg = <100>;
-                       regulator-name = "avdd_3v3_dp";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio TEGRA_GPIO(V, 2) 0>;
-                       enable-active-high;
-                       consumers {
-                               c0 {
-                                       regulator-consumer-supply = "avdd_3v3_dp";
-                               };
-                       };
-               };
-
                vdd_cdc_1v2_aud: regulator@101 {
                        compatible = "regulator-fixed-sync";
                        reg = <101>;