summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi9
-rwxr-xr-xarch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi3
-rwxr-xr-xarch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi3
-rw-r--r--arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi9
-rw-r--r--arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi8
5 files changed, 6 insertions, 26 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi
index a2ef38067313..bc35996ff744 100644
--- a/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi
@@ -216,15 +216,6 @@
reg = <0 0x90400000 0 0x100000>;
no-map;
};
-
- /* global autoconfigured region for contiguous allocations */
- linux,cma {
- compatible = "shared-dma-pool";
- reusable;
- size = <0 0x3c000000>;
- alloc-ranges = <0 0x96000000 0 0x3c000000>;
- linux,cma-default;
- };
};
sound {
diff --git a/arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi
index d759addb71e4..c7c072271ca8 100755
--- a/arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi
@@ -132,6 +132,9 @@
#size-cells = <2>;
ranges;
+ /* use the kernel configuration settings instead */
+ /delete-node/ linux,cma;
+
rpmsg_reserved: rpmsg@b8000000 {
no-map;
reg = <0 0xb8000000 0 0x400000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
index 4d4211d3e145..00b713ce6f32 100755
--- a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
@@ -119,6 +119,9 @@
#size-cells = <2>;
ranges;
+ /* use the kernel configuration settings instead */
+ /delete-node/ linux,cma;
+
rpmsg_reserved: rpmsg@55800000 {
no-map;
reg = <0 0x55800000 0 0x800000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi
index 44c21bb56e37..f47ea1c5483d 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi
@@ -209,15 +209,6 @@
reg = <0 0x94400000 0 0x800000>;
};
- /* global autoconfigured region for contiguous allocations */
- linux,cma {
- compatible = "shared-dma-pool";
- reusable;
- size = <0 0x3c000000>;
- alloc-ranges = <0 0x96000000 0 0x3c000000>;
- linux,cma-default;
- };
-
vdev0vring0: vdev0vring0@90000000 {
compatible = "shared-dma-pool";
reg = <0 0x90000000 0 0x8000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi
index 0c1269a97db5..957f0da9604a 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi
@@ -141,14 +141,6 @@
reg = <0 0x94400000 0 0x800000>;
};
- /* global autoconfigured region for contiguous allocations */
- linux,cma {
- compatible = "shared-dma-pool";
- reusable;
- size = <0 0x3c000000>;
- alloc-ranges = <0 0x96000000 0 0x3c000000>;
- };
-
vdev0vring0: vdev0vring0@90000000 {
compatible = "shared-dma-pool";
reg = <0 0x90000000 0 0x8000>;