Synchronise the USB device tree definition with Linux, allowing
the U-Boot control FDT to be used to boot a Linux system with
working USB.

An extra compatible string, "fsl,layerscape-dwc3" is needed
for special handling in U-Boot, so has been added to the
-u-boot.dtsi file. It might be better to add this to the
Linux source bindings.

Signed-off-by: Mathew McBride <m...@traverse.com.au>
---
 arch/arm/dts/fsl-ls1088a-u-boot.dtsi |  8 +++++++
 arch/arm/dts/fsl-ls1088a.dtsi        | 36 +++++++++++++++++-----------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/arch/arm/dts/fsl-ls1088a-u-boot.dtsi 
b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi
index ac30b813ff..3a2291527c 100644
--- a/arch/arm/dts/fsl-ls1088a-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi
@@ -29,3 +29,11 @@
        status = "okay";
 };
 
+&usb0 {
+       compatible = "fsl,layerscape-dwc3", "snps,dwc3";
+};
+
+&usb1 {
+       compatible = "fsl,layerscape-dwc3", "snps,dwc3";
+};
+
diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index bd344ba8e2..ca88b9e9f4 100644
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -256,6 +256,28 @@
                        status = "disabled";
                };
 
+               usb0: usb@3100000 {
+                       compatible = "snps,dwc3";
+                       reg = <0x0 0x3100000 0x0 0x10000>;
+                       interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
+                       dr_mode = "host";
+                       snps,quirk-frame-length-adjustment = <0x20>;
+                       snps,dis_rxdet_inp3_quirk;
+                       snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
+                       status = "disabled";
+               };
+
+               usb1: usb@3110000 {
+                       compatible = "snps,dwc3";
+                       reg = <0x0 0x3110000 0x0 0x10000>;
+                       interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
+                       dr_mode = "host";
+                       snps,quirk-frame-length-adjustment = <0x20>;
+                       snps,dis_rxdet_inp3_quirk;
+                       snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
+                       status = "disabled";
+               };
+
                pcie1: pcie@3400000 {
                        compatible = "fsl,ls1088a-pcie";
                        reg = <0x00 0x03400000 0x0 0x00100000>, /* controller 
registers */
@@ -490,20 +512,6 @@
                interrupts = <0 21 0x4>; /* Level high type */
        };
 
-       usb0: usb3@3100000 {
-               compatible = "fsl,layerscape-dwc3";
-               reg = <0x0 0x3100000 0x0 0x10000>;
-               interrupts = <0 80 0x4>; /* Level high type */
-               dr_mode = "host";
-       };
-
-       usb1: usb3@3110000 {
-               compatible = "fsl,layerscape-dwc3";
-               reg = <0x0 0x3110000 0x0 0x10000>;
-               interrupts = <0 81 0x4>; /* Level high type */
-               dr_mode = "host";
-       };
-
        crypto: crypto@8000000 {
                compatible = "fsl,sec-v5.0", "fsl,sec-v4.0";
                fsl,sec-era = <8>;
-- 
2.30.1

Reply via email to