arm64: dts: layerscape: add dma-coherent for usb node

Add SOC special compatible string, remove fallback snps,dwc3 to let flatten
dwc3-layerscape driver to be probed and enable dma-coherence for usb node
since commit add layerscape dwc3 support, which set correct gsbustcfg0
value.

Add iommus property to run at old uboot, which use fixup add iommus by
check compatible string snsp,dwc3 compatible string.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index fc3e138..ef80bf6 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -493,10 +493,11 @@
                };
 
                usb0: usb@2f00000 {
-                       compatible = "snps,dwc3";
+                       compatible = "fsl,ls1012a-dwc3", "fsl,ls1028a-dwc3";
                        reg = <0x0 0x2f00000 0x0 0x10000>;
                        interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
                        dr_mode = "host";
+                       dma-coherent;
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 7d172d7..e7f9c93 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -613,9 +613,11 @@
                };
 
                usb0: usb@3100000 {
-                       compatible = "fsl,ls1028a-dwc3", "snps,dwc3";
+                       compatible = "fsl,ls1028a-dwc3";
                        reg = <0x0 0x3100000 0x0 0x10000>;
                        interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+                       iommus = <&smmu 1>;
+                       dma-coherent;
                        snps,dis_rxdet_inp3_quirk;
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -623,9 +625,11 @@
                };
 
                usb1: usb@3110000 {
-                       compatible = "fsl,ls1028a-dwc3", "snps,dwc3";
+                       compatible = "fsl,ls1028a-dwc3";
                        reg = <0x0 0x3110000 0x0 0x10000>;
                        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+                       iommus = <&smmu 2>;
+                       dma-coherent;
                        snps,dis_rxdet_inp3_quirk;
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 73315c5..50d9b03 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -833,10 +833,11 @@
                        dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x00000000>;
 
                        usb0: usb@2f00000 {
-                               compatible = "snps,dwc3";
+                               compatible = "fsl,ls1043a-dwc3", "fsl,ls1028a-dwc3";
                                reg = <0x0 0x2f00000 0x0 0x10000>;
                                interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
                                dr_mode = "host";
+                               dma-coherent;
                                snps,quirk-frame-length-adjustment = <0x20>;
                                snps,dis_rxdet_inp3_quirk;
                                usb3-lpm-capable;
@@ -845,10 +846,11 @@
                        };
 
                        usb1: usb@3000000 {
-                               compatible = "snps,dwc3";
+                               compatible = "fsl,ls1043a-dwc3", "fsl,ls1028a-dwc3";
                                reg = <0x0 0x3000000 0x0 0x10000>;
                                interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
                                dr_mode = "host";
+                               dma-coherent;
                                snps,quirk-frame-length-adjustment = <0x20>;
                                snps,dis_rxdet_inp3_quirk;
                                usb3-lpm-capable;
@@ -857,10 +859,11 @@
                        };
 
                        usb2: usb@3100000 {
-                               compatible = "snps,dwc3";
+                               compatible = "fsl,ls1043a-dwc3", "fsl,ls1028a-dwc3";
                                reg = <0x0 0x3100000 0x0 0x10000>;
                                interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
                                dr_mode = "host";
+                               dma-coherent;
                                snps,quirk-frame-length-adjustment = <0x20>;
                                snps,dis_rxdet_inp3_quirk;
                                usb3-lpm-capable;

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 770d91e..22173d6 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -749,10 +749,11 @@
                        dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x00000000>;
 
                        usb0: usb@2f00000 {
-                               compatible = "snps,dwc3";
+                               compatible = "fsl,ls1046a-dwc3", "fsl,ls1028a-dwc3";
                                reg = <0x0 0x2f00000 0x0 0x10000>;
                                interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
                                dr_mode = "host";
+                               dma-coherent;
                                snps,quirk-frame-length-adjustment = <0x20>;
                                snps,dis_rxdet_inp3_quirk;
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -760,10 +761,11 @@
                        };
 
                        usb1: usb@3000000 {
-                               compatible = "snps,dwc3";
+                               compatible = "fsl,ls1046a-dwc3", "fsl,ls1028a-dwc3";
                                reg = <0x0 0x3000000 0x0 0x10000>;
                                interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
                                dr_mode = "host";
+                               dma-coherent;
                                snps,quirk-frame-length-adjustment = <0x20>;
                                snps,dis_rxdet_inp3_quirk;
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -771,10 +773,11 @@
                        };
 
                        usb2: usb@3100000 {
-                               compatible = "snps,dwc3";
+                               compatible = "fsl,ls1046a-dwc3", "fsl,ls1028a-dwc3";
                                reg = <0x0 0x3100000 0x0 0x10000>;
                                interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
                                dr_mode = "host";
+                               dma-coherent;
                                snps,quirk-frame-length-adjustment = <0x20>;
                                snps,dis_rxdet_inp3_quirk;
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index 9d57263..b2f6cd2 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -489,10 +489,12 @@
                };
 
                usb0: usb@3100000 {
-                       compatible = "snps,dwc3";
+                       compatible = "fsl,ls1088a-dwc3", "fsl,ls1028a-dwc3";
                        reg = <0x0 0x3100000 0x0 0x10000>;
                        interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
                        dr_mode = "host";
+                       iommus = <&smmu 1>;
+                       dma-coherent;
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -500,10 +502,12 @@
                };
 
                usb1: usb@3110000 {
-                       compatible = "snps,dwc3";
+                       compatible = "fsl,ls1088a-dwc3", "fsl,ls1028a-dwc3";
                        reg = <0x0 0x3110000 0x0 0x10000>;
                        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
                        dr_mode = "host";
+                       iommus = <&smmu 2>;
+                       dma-coherent;
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
index c954140..d899c03 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
@@ -1094,24 +1094,28 @@
                };
 
                usb0: usb@3100000 {
-                       compatible = "snps,dwc3";
+                       compatible = "fsl,lx2160a-dwc3", "fsl,ls1028a-dwc3";
                        reg = <0x0 0x3100000 0x0 0x10000>;
                        interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
                        dr_mode = "host";
                        snps,quirk-frame-length-adjustment = <0x20>;
                        usb3-lpm-capable;
+                       iommus = <&smmu 1>;
+                       dma-coherent;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                        status = "disabled";
                };
 
                usb1: usb@3110000 {
-                       compatible = "snps,dwc3";
+                       compatible = "fsl,lx2160a-dwc3", "fsl,ls1028a-dwc3";
                        reg = <0x0 0x3110000 0x0 0x10000>;
                        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
                        dr_mode = "host";
                        snps,quirk-frame-length-adjustment = <0x20>;
                        usb3-lpm-capable;
+                       iommus = <&smmu 2>;
+                       dma-coherent;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                        status = "disabled";