[PATCH 04/10] ARM: dts: bcm2835: adjust DMA nodes

Stefan Wahren stefan.wahren at i2se.com
Sun Jun 4 05:12:17 PDT 2023


After converting the bcm2835-dma DT binding to YAML, the DT schema
checks gave warnings like:

$nodename:0: 'dma at 7e007000' does not match '^dma-controller(@.*)?$'
'dma-channel-mask' is a required property
Unevaluated properties are not allowed ('brcm,dma-channel-mask' was unexpected)

So fix them accordingly.

Signed-off-by: Stefan Wahren <stefan.wahren at i2se.com>
---
 arch/arm/boot/dts/bcm2711.dtsi        | 4 ++--
 arch/arm/boot/dts/bcm2835-common.dtsi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
index 097e9f252235..83745672a120 100644
--- a/arch/arm/boot/dts/bcm2711.dtsi
+++ b/arch/arm/boot/dts/bcm2711.dtsi
@@ -76,7 +76,7 @@ thermal: thermal {
 			};
 		};
 
-		dma: dma at 7e007000 {
+		dma: dma-controller at 7e007000 {
 			compatible = "brcm,bcm2835-dma";
 			reg = <0x7e007000 0xb00>;
 			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
@@ -103,7 +103,7 @@ dma: dma at 7e007000 {
 					  "dma9",
 					  "dma10";
 			#dma-cells = <1>;
-			brcm,dma-channel-mask = <0x07f5>;
+			dma-channel-mask = <0x07f5>;
 		};
 
 		pm: watchdog at 7e100000 {
diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
index bb7e8f7facaf..3ba8db8eed0f 100644
--- a/arch/arm/boot/dts/bcm2835-common.dtsi
+++ b/arch/arm/boot/dts/bcm2835-common.dtsi
@@ -8,7 +8,7 @@ / {
 	interrupt-parent = <&intc>;
 
 	soc {
-		dma: dma at 7e007000 {
+		dma: dma-controller at 7e007000 {
 			compatible = "brcm,bcm2835-dma";
 			reg = <0x7e007000 0xf00>;
 			interrupts = <1 16>,
@@ -46,7 +46,7 @@ dma: dma at 7e007000 {
 					  "dma14",
 					  "dma-shared-all";
 			#dma-cells = <1>;
-			brcm,dma-channel-mask = <0x7f35>;
+			dma-channel-mask = <0x7f35>;
 		};
 
 		intc: interrupt-controller at 7e00b200 {
-- 
2.34.1




More information about the linux-arm-kernel mailing list