On 18/11/2020 03:46, JC Kuo wrote:
> 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 <jckuo@xxxxxxxxxx>
> ---
> .../arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 20 +++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
> index e18e1a9a3011..a9caaf7c0d67 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
> @@ -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>;
> + };
> };
>
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 stable@xxxxxxxxxxxxxxx on this.
Reviewed-by: Jon Hunter <jonathanh@xxxxxxxxxx>
Cheers
Jon
--
nvpublic
