Skip to content

Commit

Permalink
ARM: dts: Use upstream CMA configuration
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas Saenz Julienne authored and pelwell committed Apr 11, 2020
1 parent 7677519 commit 09dafe2
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions arch/arm/boot/dts/bcm2711-rpi-4-b.dts
Expand Up @@ -195,7 +195,7 @@

/ {
chosen {
bootargs = "coherent_pool=1M 8250.nr_uarts=1 cma=64M";
bootargs = "coherent_pool=1M 8250.nr_uarts=1";
};

aliases {
Expand All @@ -215,10 +215,6 @@
};

/delete-node/ wifi-pwrseq;

reserved-memory {
/delete-node/ linux,cma;
};
};

&mmcnr {
Expand Down

0 comments on commit 09dafe2

Please sign in to comment.