1 |
From d0ef729bfe9fc79bbcfd2be1cd085020e5b05156 Mon Sep 17 00:00:00 2001 |
2 |
From: Sasha Levin <sashal@kernel.org> |
3 |
Date: Sat, 29 Jan 2022 18:54:29 +0100 |
4 |
Subject: arm64: dts: rockchip: align pl330 node name with dtschema |
5 |
|
6 |
From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> |
7 |
|
8 |
[ Upstream commit 8fd9415042826c7609c588e5ef45f3e84237785f ] |
9 |
|
10 |
Fixes dtbs_check warnings like: |
11 |
|
12 |
dmac@ff240000: $nodename:0: 'dmac@ff240000' does not match '^dma-controller(@.*)?$' |
13 |
|
14 |
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> |
15 |
Link: https://lore.kernel.org/r/20220129175429.298836-1-krzysztof.kozlowski@canonical.com |
16 |
Signed-off-by: Heiko Stuebner <heiko@sntech.de> |
17 |
Signed-off-by: Sasha Levin <sashal@kernel.org> |
18 |
--- |
19 |
arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +- |
20 |
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- |
21 |
2 files changed, 2 insertions(+), 2 deletions(-) |
22 |
|
23 |
diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi |
24 |
index 248ebb61aa79..5200d0bbd9e9 100644 |
25 |
--- a/arch/arm64/boot/dts/rockchip/px30.dtsi |
26 |
+++ b/arch/arm64/boot/dts/rockchip/px30.dtsi |
27 |
@@ -711,7 +711,7 @@ |
28 |
clock-names = "pclk", "timer"; |
29 |
}; |
30 |
|
31 |
- dmac: dmac@ff240000 { |
32 |
+ dmac: dma-controller@ff240000 { |
33 |
compatible = "arm,pl330", "arm,primecell"; |
34 |
reg = <0x0 0xff240000 0x0 0x4000>; |
35 |
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>, |
36 |
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi |
37 |
index da84be6f4715..3cbe83e6fb9a 100644 |
38 |
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi |
39 |
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi |
40 |
@@ -489,7 +489,7 @@ |
41 |
status = "disabled"; |
42 |
}; |
43 |
|
44 |
- dmac: dmac@ff1f0000 { |
45 |
+ dmac: dma-controller@ff1f0000 { |
46 |
compatible = "arm,pl330", "arm,primecell"; |
47 |
reg = <0x0 0xff1f0000 0x0 0x4000>; |
48 |
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, |
49 |
-- |
50 |
2.34.1 |
51 |
|