From: Anson Huang Date: Tue, 3 Mar 2020 09:01:02 +0000 (+0800) Subject: LF-665-16 arm64: dts: imx8mn: make sure cma do not overlap dma zone X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~577^2~2^2~491 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=53d0df04de9c1a418e147b3b4a2fcc4e11246da0;p=linux.git LF-665-16 arm64: dts: imx8mn: make sure cma do not overlap dma zone After commit 1a8e1cef7603 ("arm64: use both ZONE_DMA and ZONE_DMA32"), ZONE_DMA will contain the lower 1G of memory. Change the CMA range start or size to ensure it's not overlapped with dma zone. Signed-off-by: Dong Aisheng Signed-off-by: Anson Huang --- diff --git a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-root.dts b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-root.dts index 9e71421e4f4b..5388f8fffcfa 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-root.dts +++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-root.dts @@ -22,7 +22,7 @@ TODO: need uncomment when linux ready compatible = "shared-dma-pool"; reusable; size = <0 0x28000000>; - alloc-ranges = <0 0x40000000 0 0x93c00000>; + alloc-ranges = <0 0x40000000 0 0x40000000>; linux,cma-default; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi index 598e608664d3..633cdcbf9f27 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi @@ -157,7 +157,7 @@ compatible = "shared-dma-pool"; reusable; size = <0 0x28000000>; - alloc-ranges = <0 0x40000000 0 0x60000000>; + alloc-ranges = <0 0x40000000 0 0x40000000>; linux,cma-default; }; };