ARM: dts: Use upstream CMA configuration

Now that the kernel command line has precedence over the device tree,
we can use the upstream CMA setup without breaking backward
compatibility.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>

diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index 83a8431..9961123 100644 (file)
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -195,7 +195,7 @@
 
 / {
        chosen {
-               bootargs = "coherent_pool=1M 8250.nr_uarts=1 cma=64M";
+               bootargs = "coherent_pool=1M 8250.nr_uarts=1";
        };
 
        aliases {
@@ -215,10 +215,6 @@
        };
 
        /delete-node/ wifi-pwrseq;
-
-       reserved-memory {
-               /delete-node/ linux,cma;
-       };
 };
 
 &mmcnr {