Skip to contentSkip to conversation

arm64: tegra: jetson-tx1: Fix USB_VBUS_EN0 regulator

PATCH Superseded JC Kuo 2 participants 3 messages Nov 18, 2020 – Nov 19, 2020

Subsystems (2)
Device tree bindings Tegra architecture support

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

JC Kuo

author
#0 lore raw

PATCH 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.

Signed-off-by JC Kuo <[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
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 35 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.

Signed-off-by JC Kuo <[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 +1 -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>;
 	};
+

arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi vdd_cam_1v8: regulator@13 { · line 1715

Quoted 10 lines
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +9 -0
+	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>;
+	};
 };

Thanks for catching this! We should add the 'Fixes:' tag.

By the way, I assume that VBUS is currently broken for the OTG port. Without this change is that USB port completely broken? I am wondering if we need to CC [email protected] on this.

Reviewed-by Jon Hunter <[email protected]>

Cheers
Jon

Signature · 1 line
nvpublic
author
#2 lore raw
Quoted 41 lines · Jon Hunter
Quoted 39 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.

Signed-off-by JC Kuo <[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 +6 -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>;
Quoted 8 lines

arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi vdd_cam_1v8: regulator@13 { · line 1715

Quoted 6 lines
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +4 -0
+		gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		vin-supply = <&vdd_5v0_sys>;
+	};
 };

Thanks for catching this! We should add the 'Fixes:' tag.

Thanks for review. I will submit v2 and add 'Fixes:' tag.

Quoted 4 lines

By the way, I assume that VBUS is currently broken for the OTG port. Without this change is that USB port completely broken? I am wondering if we need to CC [email protected] on this.

You are correct. Host mode at the OTG port is currently broken because VBUS is not supplied to the OTG port. I will CC [email protected] when send v2.

Quoted 6 lines
Reviewed-by Jon Hunter <[email protected]>

Cheers
Jon