arm64: tegra: jetson-cv: correct power tree

The change fix the following power supply:
1. avdd_dsi_csi supply for vi
2. camera i2c power supply
3. otg vbus supply
4. xusb vbus supply
5. touch power supply

And remove some unnecessary overrides.

Bug 1606897

Change-Id: I2465b05e01fc4d1acb0c8d615f90ea731bdf7d8c
Signed-off-by: Kerwin Wan <kerwinw@nvidia.com>
Reviewed-on: http://git-master/r/748748
GVS: Gerrit_Virtual_Submit
Reviewed-by: Hayden Du <haydend@nvidia.com>

diff --git a/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts b/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts
index 46d2d930a503cac2effbaf7e54e92af7bce7211f..ad606d9b10e2aca95ae9ffc547cf4ede76632012 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts
+++ b/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts
@@ -329,7 +329,8 @@
        };
 
        i2c@546c0000 {
-               avdd_dsi_csi-supply = <&max77620_gpio7>;
+               bus-pullup-supply = <&max77620_sd3>;
+               avdd_dsi_csi-supply = <&max77620_sd3>;
        };
 
        sysedp {

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 c962adc1b88e3d84b2391924d87a7d7b173d4cfc..63ef1cbb005dbfbfa5e33df2f6a2144e614ed58f 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
@@ -42,8 +42,6 @@
                };
 
                vdd_fan: regulator@13 {
-                       compatible = "regulator-fixed-sync";
-                       regulator-name = "vdd-fan";
                        gpio = <&tca9539_74 4 0>;
                };
 
@@ -110,18 +108,44 @@
                        gpio = <&gpio TEGRA_GPIO(H, 1) 0>;
                        enable-active-high;
                };
+
+               en_usb_vbus2: regulator@24 {
+                       compatible = "regulator-fixed-sync";
+                       regulator-name = "en-usb-vbus2";
+                       regulator-min-microvol = <5000000>;
+                       regulator-max-microvol = <5000000>;
+                       gpio = <&gpio TEGRA_GPIO(CC, 5) 0>;
+                       enable-active-high;
+               };
        };
 
        host1x {
                dc@54200000 {
                        vdd_lcd-supply = <&max77620_ldo0>; /* DSI is POR */
                };
-               dc@54240000 {
-                       vdd_hdmi_5v0-supply = <&vdd_hdmi>;
+
+               vi {
+                       avdd_dsi_csi-supply = <&max77620_ldo0>;
                };
        };
 
        pwm-fan {
                vdd-fan-supply = <&vdd_fan>;
        };
+
+       otg@7d000000 {
+               usb_vbus-supply = <&usb_vbus1>;
+       };
+
+       xusb@70090000 {
+               usb_vbus1-supply = <&en_vdd_eth_5v0>;
+               usb_vbus2-supply = <&en_usb_vbus2>;
+       };
+
+       spi@7000da00 {
+               spi-touch19x12@0 {
+                       avdd-supply = <&en_vdd_ts_hv_3v3>;
+                       dvdd-supply = <&en_vdd_ts_1v8>;
+               };
+       };
 };