| From 4d0f0dfc57f6a8652c624575ea34f04bddea629b Mon Sep 17 00:00:00 2001 |
| From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> |
| Date: Thu, 2 Apr 2020 19:22:46 +0200 |
| Subject: [PATCH] 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> |
| --- |
| arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| --- 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 { |