You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
96 lines
2.7 KiB
Diff
96 lines
2.7 KiB
Diff
From a2e6d1c03908eccf76b9305c4a493230a36035c0 Mon Sep 17 00:00:00 2001
|
|
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Date: Fri, 10 Jan 2020 18:29:35 +0100
|
|
Subject: [PATCH] ARM: dts: bcm283x: Unify CMA configuration
|
|
|
|
commit c5a1e5375d19bd4001c59dc5d482ac5b1ba51cbf upstream.
|
|
|
|
With the introduction of the Raspberry Pi 4 we were forced to explicitly
|
|
configure CMA's location, since arm64 defaults it into the ZONE_DMA32
|
|
memory area, which is not good enough to perform DMA operations on that
|
|
device. To bypass this limitation a dedicated CMA DT node was created,
|
|
explicitly indicating the acceptable memory range and size.
|
|
|
|
That said, compatibility between boards is a must on the Raspberry Pi
|
|
ecosystem so this creates a common CMA DT node so as for DT overlays to
|
|
be able to update CMA's properties regardless of the board being used.
|
|
|
|
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Reviewed-by: Phil Elwell <phil@raspberrypi.org>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/bcm2711.dtsi | 32 +++++++++++++-------------------
|
|
arch/arm/boot/dts/bcm283x.dtsi | 13 +++++++++++++
|
|
2 files changed, 26 insertions(+), 19 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm2711.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2711.dtsi
|
|
@@ -12,25 +12,6 @@
|
|
|
|
interrupt-parent = <&gicv2>;
|
|
|
|
- reserved-memory {
|
|
- #address-cells = <2>;
|
|
- #size-cells = <1>;
|
|
- ranges;
|
|
-
|
|
- /*
|
|
- * arm64 reserves the CMA by default somewhere in ZONE_DMA32,
|
|
- * that's not good enough for the BCM2711 as some devices can
|
|
- * only address the lower 1G of memory (ZONE_DMA).
|
|
- */
|
|
- linux,cma {
|
|
- compatible = "shared-dma-pool";
|
|
- size = <0x2000000>; /* 32MB */
|
|
- alloc-ranges = <0x0 0x00000000 0x40000000>;
|
|
- reusable;
|
|
- linux,cma-default;
|
|
- };
|
|
- };
|
|
-
|
|
vc4: gpu {
|
|
compatible = "brcm,bcm2711-vc5";
|
|
status = "disabled";
|
|
@@ -992,6 +973,19 @@
|
|
};
|
|
};
|
|
|
|
+&rmem {
|
|
+ #address-cells = <2>;
|
|
+};
|
|
+
|
|
+&cma {
|
|
+ /*
|
|
+ * arm64 reserves the CMA by default somewhere in ZONE_DMA32,
|
|
+ * that's not good enough for the BCM2711 as some devices can
|
|
+ * only address the lower 1G of memory (ZONE_DMA).
|
|
+ */
|
|
+ alloc-ranges = <0x0 0x00000000 0x40000000>;
|
|
+};
|
|
+
|
|
&i2c0 {
|
|
compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
|
|
interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
|
|
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
|
@@ -30,6 +30,19 @@
|
|
stdout-path = "serial0:115200n8";
|
|
};
|
|
|
|
+ rmem: reserved-memory {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ ranges;
|
|
+
|
|
+ cma: linux,cma {
|
|
+ compatible = "shared-dma-pool";
|
|
+ size = <0x4000000>; /* 64MB */
|
|
+ reusable;
|
|
+ linux,cma-default;
|
|
+ };
|
|
+ };
|
|
+
|
|
thermal-zones {
|
|
cpu_thermal: cpu-thermal {
|
|
polling-delay-passive = <0>;
|