From e0103b5f09a9c2131a42a3b03d1d4a7796545fa2 Mon Sep 17 00:00:00 2001
From: Dara Stotland <dstotland@nvidia.com>
Date: Mon, 26 Aug 2024 16:47:23 +0000
Subject: [PATCH] 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>

Bug 4707773

Change-Id: I7af97cc993d9561d1b05b7326e374ae50a724d05
Signed-off-by: Brad Griffis <bgriffis@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3207085
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
---
 tegra234-p3701-0000.dtsi           | 27 ---------------------------
 tegra234-p3701.dtsi                | 23 +++++++++++++++++++++++
 tegra234-p3740-0002+p3701-0008.dts |  6 ------
 3 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/tegra234-p3701-0000.dtsi b/tegra234-p3701-0000.dtsi
index 2830eab..d977f49 100644
--- a/tegra234-p3701-0000.dtsi
+++ b/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/tegra234-p3701.dtsi b/tegra234-p3701.dtsi
index 18bd4cc..0471cea 100644
--- a/tegra234-p3701.dtsi
+++ b/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/tegra234-p3740-0002+p3701-0008.dts b/tegra234-p3740-0002+p3701-0008.dts
index 9581b31..36e8880 100644
--- a/tegra234-p3740-0002+p3701-0008.dts
+++ b/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 {