aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRan Wang <ran.wang_1@nxp.com>2019-05-29 16:18:06 +0800
committerDaniel Thompson <daniel@redfelineninja.org.uk>2019-09-17 16:03:00 +0100
commit358577f78b3a9821f8a1e7975cb5098fff167469 (patch)
treefdf91eb2cdb89e99bff4a258f1069be5040739d0
parentd0f73bcae7e16ace00d339e4d73f027e92d5bb5c (diff)
downloadlinux-358577f78b3a9821f8a1e7975cb5098fff167469.tar.gz
sdk: dts: ls1046frwy move dma-coherent from soc to its child nodes
Since SMMU is not supported for SDK version, USB function will down if still apply property 'dma-coherent' in scope of soc (USB driver is not ready to support it alone) in SDK device trees, decide to remove it. And add dma-coherent on other non-USB child nodes under soc. Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts178
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-usdpaa.dts4
2 files changed, 182 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts
index 7c9a9f14ab49..cc83c79a359f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-sdk.dts
@@ -24,6 +24,8 @@
};
&soc {
+/delete-property/ dma-coherent;
+
#include "qoriq-dpaa-eth.dtsi"
#include "qoriq-fman3-0-6oh.dtsi"
@@ -65,3 +67,179 @@
&fman0 {
compatible = "fsl,fman", "simple-bus";
};
+
+&clockgen {
+ dma-coherent;
+};
+
+&scfg {
+ dma-coherent;
+};
+
+&crypto {
+ dma-coherent;
+};
+
+&dcfg {
+ dma-coherent;
+};
+
+&ifc {
+ dma-coherent;
+};
+
+&qspi {
+ dma-coherent;
+};
+
+&esdhc {
+ dma-coherent;
+};
+
+&ddr {
+ dma-coherent;
+};
+
+&tmu {
+ dma-coherent;
+};
+
+&qman {
+ dma-coherent;
+};
+
+&bman {
+ dma-coherent;
+};
+
+&bportals {
+ dma-coherent;
+};
+
+&qportals {
+ dma-coherent;
+};
+
+&dspi {
+ dma-coherent;
+};
+
+&i2c0 {
+ dma-coherent;
+};
+
+&i2c1 {
+ dma-coherent;
+};
+
+&i2c2 {
+ dma-coherent;
+};
+
+&i2c3 {
+ dma-coherent;
+};
+
+&duart0 {
+ dma-coherent;
+};
+
+&duart1 {
+ dma-coherent;
+};
+
+&duart2 {
+ dma-coherent;
+};
+
+&duart3 {
+ dma-coherent;
+};
+
+&gpio0 {
+ dma-coherent;
+};
+
+&gpio1 {
+ dma-coherent;
+};
+
+&gpio2 {
+ dma-coherent;
+};
+
+&gpio3 {
+ dma-coherent;
+};
+
+&lpuart0 {
+ dma-coherent;
+};
+
+&lpuart1 {
+ dma-coherent;
+};
+
+&lpuart2 {
+ dma-coherent;
+};
+
+&lpuart3 {
+ dma-coherent;
+};
+
+&lpuart4 {
+ dma-coherent;
+};
+
+&lpuart5 {
+ dma-coherent;
+};
+
+&ftm0 {
+ dma-coherent;
+};
+
+&wdog0 {
+ dma-coherent;
+};
+
+&edma0 {
+ dma-coherent;
+};
+
+&sata {
+ dma-coherent;
+};
+
+&qdma {
+ dma-coherent;
+};
+
+&msi1 {
+ dma-coherent;
+};
+
+&msi2 {
+ dma-coherent;
+};
+
+&msi3 {
+ dma-coherent;
+};
+
+&fman0 {
+ dma-coherent;
+};
+
+&ptp_timer0 {
+ dma-coherent;
+};
+
+&serdes1 {
+ dma-coherent;
+};
+
+&fsldpaa {
+ dma-coherent;
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-usdpaa.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-usdpaa.dts
index 38cbeaec70c3..bd4f884eb945 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-usdpaa.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy-usdpaa.dts
@@ -14,6 +14,7 @@
fsl,bpid = <7>;
fsl,bpool-ethernet-cfg = <0 0 0 192 0 0xdeadbeef>;
fsl,bpool-thresholds = <0x400 0xc00 0x0 0x0>;
+ dma-coherent;
};
bp8: buffer-pool@8 {
@@ -21,6 +22,7 @@
fsl,bpid = <8>;
fsl,bpool-ethernet-cfg = <0 0 0 576 0 0xabbaf00d>;
fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>;
+ dma-coherent;
};
bp9: buffer-pool@9 {
@@ -28,10 +30,12 @@
fsl,bpid = <9>;
fsl,bpool-ethernet-cfg = <0 0 0 2048 0 0xfeedabba>;
fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>;
+ dma-coherent;
};
fsl,dpaa {
compatible = "fsl,ls1046a", "fsl,dpaa", "simple-bus";
+ dma-coherent;
ethernet@0 {
compatible = "fsl,dpa-ethernet-init";