arm64: tegra: Move padctl supply nodes to AGX Orin module

Some padctl supply nodes currently reside in board file, when they
should reside on module level. The nodes are part of module,
not board. Move these nodes to the correct AGX Orin
module file.

Signed-off-by: Dara Stotland <dstotland@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
index 2830eab1b2eb933a15f7e11c46936fcceb88a428..d977f4901c0947280c8a1df450a1e96baaf3bb47 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
@@ -6,33 +6,6 @@
        model = "NVIDIA Jetson AGX Orin";
        compatible = "nvidia,p3701-0000", "nvidia,tegra234";
 
-       bus@0 {
-
-               padctl@3520000 {
-                       vclamp-usb-supply = <&vdd_1v8_ao>;
-                       avdd-usb-supply = <&vdd_3v3_ao>;
-
-                       ports {
-                               usb2-0 {
-                                       vbus-supply = <&vdd_5v0_sys>;
-                               };
-
-                               usb2-1 {
-                                       vbus-supply = <&vdd_5v0_sys>;
-                               };
-
-                               usb2-2 {
-                                       vbus-supply = <&vdd_5v0_sys>;
-                               };
-
-                               usb2-3 {
-                                       vbus-supply = <&vdd_5v0_sys>;
-                               };
-                       };
-               };
-
-       };
-
        thermal-zones {
                tj-thermal {
                        polling-delay = <1000>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi
index 18bd4ccb6b77cbcca00375575e6dc162b203ddc9..0471cea31b73201038925018f0e30d25024b7791 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi
@@ -81,6 +81,29 @@
                        non-removable;
                };
 
+               padctl@3520000 {
+                       vclamp-usb-supply = <&vdd_1v8_ao>;
+                       avdd-usb-supply = <&vdd_3v3_ao>;
+
+                       ports {
+                               usb2-0 {
+                                       vbus-supply = <&vdd_5v0_sys>;
+                               };
+
+                               usb2-1 {
+                                       vbus-supply = <&vdd_5v0_sys>;
+                               };
+
+                               usb2-2 {
+                                       vbus-supply = <&vdd_5v0_sys>;
+                               };
+
+                               usb2-3 {
+                                       vbus-supply = <&vdd_5v0_sys>;
+                               };
+                       };
+               };
+
                i2c@c240000 {
                        status = "okay";
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts b/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts
index 9581b31b459f248ef5b51c285b424504d794f25d..36e8880537460611ffe64d37159b2db4015e7d90 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts
@@ -121,8 +121,6 @@
                };
 
                padctl@3520000 {
-                       vclamp-usb-supply = <&vdd_1v8_ao>;
-                       avdd-usb-supply = <&vdd_3v3_ao>;
                        status = "okay";
 
                        pads {
@@ -175,25 +173,21 @@
                                        mode = "otg";
                                        usb-role-switch;
                                        status = "okay";
-                                       vbus-supply = <&vdd_5v0_sys>;
                                };
 
                                usb2-1 {
                                        mode = "host";
                                        status = "okay";
-                                       vbus-supply = <&vdd_5v0_sys>;
                                };
 
                                usb2-2 {
                                        mode = "host";
                                        status = "okay";
-                                       vbus-supply = <&vdd_5v0_sys>;
                                };
 
                                usb2-3 {
                                        mode = "host";
                                        status = "okay";
-                                       vbus-supply = <&vdd_5v0_sys>;
                                };
 
                                usb3-0 {