]> Gentwo Git Trees - linux/.git/commitdiff
arm64: dts: ls1046a: make dma-coherent global to the SoC
authorLi Yang <leoyang.li@nxp.com>
Thu, 15 Sep 2022 23:34:28 +0000 (18:34 -0500)
committerShawn Guo <shawnguo@kernel.org>
Sat, 17 Sep 2022 08:35:24 +0000 (16:35 +0800)
These SoCs are really completely dma coherent in their entirety so add
the dma-coherent property at the soc level in the device tree and drop
the instances where it's specifically added to a few select devices.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi

index 27033c558e3e2e383e80cabd7a866b79ba4ed819..e406499a26b44b6a824e4bd8baac30c8ff97b9f3 100644 (file)
@@ -273,6 +273,7 @@ soc: soc {
                #size-cells = <2>;
                ranges;
                dma-ranges = <0x0 0x0 0x0 0x0 0x10000 0x00000000>;
+               dma-coherent;
 
                ddr: memory-controller@1080000 {
                        compatible = "fsl,qoriq-memory-controller";
@@ -355,7 +356,6 @@ crypto: crypto@1700000 {
                        ranges = <0x0 0x00 0x1700000 0x100000>;
                        reg = <0x00 0x1700000 0x0 0x100000>;
                        interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
-                       dma-coherent;
 
                        sec_jr0: jr@10000 {
                                compatible = "fsl,sec-v5.4-job-ring",
@@ -794,7 +794,6 @@ pcie1: pcie@3400000 {
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
-                       dma-coherent;
                        num-viewport = <8>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */
@@ -834,7 +833,6 @@ pcie2: pcie@3500000 {
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
-                       dma-coherent;
                        num-viewport = <8>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000   /* downstream I/O */
@@ -874,7 +872,6 @@ pcie3: pcie@3600000 {
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
-                       dma-coherent;
                        num-viewport = <8>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000   /* downstream I/O */