2022-03-31 04:52:24

by Michael Walle

Subject: [PATCH] arm64: dts: ls1028a: default to OTG mode for USB

At the moment, the dtsi will force the dr_mode to host. This is
problematic because it will always turn on the Vbus voltage regardless
if the port is host or device. This might lead to a "shortcut" between
the two USB endpoints because both might have their Vbus supplies
enabled. Therefore, the default should be "otg" for any ports which
aren't host only (from a SoC point of view) and have a user of the dtsi
file overwrite that explicitly.

Move the 'dr_mode = "host";' into the board dts. Now that the dtsi
doesn't set the dr_mode anymore, we can also drop the 'dr_mode = "otg";'
in the board dts because that is the default value if dr_mode is not
set.

Signed-off-by: Michael Walle <[email protected]>
---
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts | 1 +
arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 ++
arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 2 +-
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 --
4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
index fef1bb585dce..68d11a9c67f3 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
@@ -341,5 +341,6 @@ &usb0 {
};

&usb1 {
+ dr_mode = "host";
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
index 19d3952dbffe..5baf060acf93 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -382,9 +382,11 @@ &sata {
};

&usb0 {
+ dr_mode = "host";
status = "okay";
};

&usb1 {
+ dr_mode = "host";
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
index 68c31cb8eead..e0cd1516d05b 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
@@ -299,10 +299,10 @@ &sata {
};

&usb0 {
+ dr_mode = "host";
status = "okay";
};

&usb1 {
- dr_mode = "otg";
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 088271d49139..92465f777603 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -599,7 +599,6 @@ usb0: usb@3100000 {
compatible = "fsl,ls1028a-dwc3", "snps,dwc3";
reg = <0x0 0x3100000 0x0 0x10000>;
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
- dr_mode = "host";
snps,dis_rxdet_inp3_quirk;
snps,quirk-frame-length-adjustment = <0x20>;
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -610,7 +609,6 @@ usb1: usb@3110000 {
compatible = "fsl,ls1028a-dwc3", "snps,dwc3";
reg = <0x0 0x3110000 0x0 0x10000>;
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
- dr_mode = "host";
snps,dis_rxdet_inp3_quirk;
snps,quirk-frame-length-adjustment = <0x20>;
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
--
2.30.2

2022-04-11 15:26:37

by Shawn Guo

Subject: Re: [PATCH] arm64: dts: ls1028a: default to OTG mode for USB

On Wed, Mar 30, 2022 at 01:34:42PM +0200, Michael Walle wrote:
> At the moment, the dtsi will force the dr_mode to host. This is
> problematic because it will always turn on the Vbus voltage regardless
> if the port is host or device. This might lead to a "shortcut" between
> the two USB endpoints because both might have their Vbus supplies
> enabled. Therefore, the default should be "otg" for any ports which
> aren't host only (from a SoC point of view) and have a user of the dtsi
> file overwrite that explicitly.
>
> Move the 'dr_mode = "host";' into the board dts. Now that the dtsi
> doesn't set the dr_mode anymore, we can also drop the 'dr_mode = "otg";'
> in the board dts because that is the default value if dr_mode is not
> set.
>
> Signed-off-by: Michael Walle <[email protected]>

Applied, thanks!