diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-06-30 13:40:40 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-06-30 15:03:33 +0200 |
| commit | 28ba8936b70b2d1cafa5a7c10da5afc1b4ec12cc (patch) | |
| tree | d820cb3744a4e36fdabfbb08ac3b5b9a31c4410f /arch/arm64 | |
| parent | 669e2e4f0b5a6370013a117baeabb6cc82f77f31 (diff) | |
arm64: dts: apalis/colibri/verdin imx8 series: remove reserved memory for cma
Use the kernel config to setup the continguous memory allocator rather
than having this settings in the device tree. (Note that an existing
node in the device tree takes precedence.)
Related-to: ELB-4019
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'arch/arm64')
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>; |