arm64: tegra: jetson-tx1: Fix USB_VBUS_EN0 regulator

PATCH Superseded JC Kuo 2 participants 2 messages Nov 19, 2020

Subsystems (3)

Stable branch Device tree bindings Tegra architecture support

lore

Share & tools

lore

JC Kuo

author

2020-11-19 03:07 UTC #0 lore raw

PATCH v2 1/1 arm64: tegra: jetson-tx1: Fix USB_VBUS_EN0 regulator

USB_VBUS_EN0 regulator (regulator@11) is being overwritten by vdd-cam-1v2 regulator. This commit rearrange USB_VBUS_EN0 to be regulator@14.

Fixes 257c8047be44 ("arm64: tegra: jetson-tx1: Add camera supplies")

Signed-off-by JC Kuo <[email protected]>

Reviewed-by Jon Hunter <[email protected]>

---
v2:
add 'Fixes:' tag
add Reviewed-by: Jon Hunter <[email protected]>

 .../arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +10 ~~-10~~

index e18e1a9a3011..a9caaf7c0d67 100644
@@ -1663,16 +1663,6 @@ vdd_usb_vbus: regulator@9 {
 		vin-supply = <&vdd_5v0_sys>;
 	};
 
-	vdd_usb_vbus_otg: regulator@11 {
-		compatible = "regulator-fixed";
-		regulator-name = "USB_VBUS_EN0";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;
-		enable-active-high;
-		vin-supply = <&vdd_5v0_sys>;
-	};
-
 	vdd_hdmi: regulator@10 {
 		compatible = "regulator-fixed";
 		regulator-name = "VDD_HDMI_5V0";

@@ -1712,4 +1702,14 @@ vdd_cam_1v8: regulator@13 {
 		enable-active-high;
 		vin-supply = <&vdd_3v3_sys>;
 	};
+
+	vdd_usb_vbus_otg: regulator@14 {
+		compatible = "regulator-fixed";
+		regulator-name = "USB_VBUS_EN0";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		vin-supply = <&vdd_5v0_sys>;
+	};
 };

Signature · 1 line

2.25.1

Greg KH

maintainer

2020-11-19 06:11 UTC #1 lore raw

Quoted 10 lines · JC Kuo

USB_VBUS_EN0 regulator (regulator@11) is being overwritten by vdd-cam-1v2 regulator. This commit rearrange USB_VBUS_EN0 to be regulator@14.
Fixes 257c8047be44 ("arm64: tegra: jetson-tx1: Add camera supplies")
Signed-off-by JC Kuo <[email protected]>
Reviewed-by Jon Hunter <[email protected]>
---
v2:
add 'Fixes:' tag
add Reviewed-by: Jon Hunter <[email protected]>

This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

</formletter>