1 From 4d0f0dfc57f6a8652c624575ea34f04bddea629b Mon Sep 17 00:00:00 2001
2 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
3 Date: Thu, 2 Apr 2020 19:22:46 +0200
4 Subject: [PATCH] ARM: dts: Use upstream CMA configuration
6 Now that the kernel command line has precedence over the device tree,
7 we can use the upstream CMA setup without breaking backward
10 Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
12 arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
15 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
16 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
21 - bootargs = "coherent_pool=1M 8250.nr_uarts=1 cma=64M";
22 + bootargs = "coherent_pool=1M 8250.nr_uarts=1";
29 /delete-node/ wifi-pwrseq;
32 - /delete-node/ linux,cma;