Skip to content

Commit 631ec37

Browse files
arndbarndb
committed
Merge tag 'dt64-cleanup-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt
Minor improvements in ARM64 DTS for v6.10 Fixes, which might have practical impact, however things were broken for long enough to justify pushing it regular path: 1. ARM Juno: shorten node names for thermal zones, because Linux drivers have strict limit of 20 characters. 2. HiSilicon: correct size of GIC GICC address space and add missing GICH and GICV spaces, add cache info to properly describe cache topology and solve kernel boot warning. Several cleanups: 1. Use capital "OR" for multiple licenses in SPDX. 2. Correct white-spaces for code readability. 3. Fix W=1 dtc compiler warnings, which should not have practical impact for Amazon, APM, Cavium, Realtek, Socionext Uniphier and Spreadtrum like: - missing unit addresses, - nodes not belonging to soc node, - not using generic node names, - few incorrect unit addresses. * tag 'dt64-cleanup-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt: (28 commits) arm64: dts: cavium: thunder2-99xx: drop redundant reg-names arm64: dts: amazon: alpine-v3: correct gic unit addresses arm64: dts: amazon: alpine-v3: drop cache nodes unit addresses arm64: dts: amazon: alpine-v3: add missing io-fabric unit addresses arm64: dts: amazon: alpine-v2: move non-MMIO node out of soc arm64: dts: amazon: alpine-v2: add missing io-fabric unit addresses arm64: dts: apm: shadowcat: move non-MMIO node out of soc arm64: dts: apm: storm: move non-MMIO node out of soc arm64: dts: cavium: correct unit addresses arm64: dts: cavium: move non-MMIO node out of soc arm64: dts: realtek: rtc16xx: add missing unit address to soc node arm64: dts: realtek: rtd139x: add missing unit address to soc node arm64: dts: realtek: rtd129x: add missing unit address to soc node arm64: dts: uniphier: ld20-global: drop audio codec port unit address arm64: dts: uniphier: ld20-global: use generic node name for audio-codec arm64: dts: uniphier: ld11-global: drop audio codec port unit address arm64: dts: uniphier: ld11-global: use generic node name for audio-codec arm64: dts: sharkl3: add missing unit addresses arm64: dts: whale2: add missing ap-apb unit address arm64: dts: sc9860: move GIC to soc node ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f71b3cf + de2ba5b commit 631ec37

23 files changed

Lines changed: 159 additions & 117 deletions

‎arch/arm64/boot/dts/amazon/alpine-v2.dtsi‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
/ {
4040
model = "Annapurna Labs Alpine v2";
4141
compatible = "al,alpine-v2";
42+
interrupt-parent = <&gic>;
4243
#address-cells = <2>;
4344
#size-cells = <2>;
4445

@@ -89,6 +90,22 @@
8990
clock-frequency = <1000000>;
9091
};
9192

93+
timer {
94+
compatible = "arm,armv8-timer";
95+
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
96+
<GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
97+
<GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
98+
<GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
99+
};
100+
101+
pmu {
102+
compatible = "arm,cortex-a57-pmu";
103+
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
104+
<GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
105+
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
106+
<GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
107+
};
108+
92109
soc {
93110
compatible = "simple-bus";
94111
#address-cells = <2>;
@@ -97,22 +114,6 @@
97114
interrupt-parent = <&gic>;
98115
ranges;
99116

100-
timer {
101-
compatible = "arm,armv8-timer";
102-
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
103-
<GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
104-
<GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
105-
<GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
106-
};
107-
108-
pmu {
109-
compatible = "arm,cortex-a57-pmu";
110-
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
111-
<GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
112-
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
113-
<GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
114-
};
115-
116117
gic: interrupt-controller@f0200000 {
117118
compatible = "arm,gic-v3";
118119
reg = <0x0 0xf0200000 0x0 0x10000>, /* GIC Dist */
@@ -150,7 +151,7 @@
150151
al,msi-num-spis = <160>;
151152
};
152153

153-
io-fabric {
154+
io-fabric@fc000000 {
154155
compatible = "simple-bus";
155156
#address-cells = <1>;
156157
#size-cells = <1>;

‎arch/arm64/boot/dts/amazon/alpine-v3.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
next-level-cache = <&cluster3_l2>;
245245
};
246246

247-
cluster0_l2: cache@0 {
247+
cluster0_l2: cache-0 {
248248
compatible = "cache";
249249
cache-size = <0x200000>;
250250
cache-line-size = <64>;
@@ -253,7 +253,7 @@
253253
cache-unified;
254254
};
255255

256-
cluster1_l2: cache@100 {
256+
cluster1_l2: cache-100 {
257257
compatible = "cache";
258258
cache-size = <0x200000>;
259259
cache-line-size = <64>;
@@ -262,7 +262,7 @@
262262
cache-unified;
263263
};
264264

265-
cluster2_l2: cache@200 {
265+
cluster2_l2: cache-200 {
266266
compatible = "cache";
267267
cache-size = <0x200000>;
268268
cache-line-size = <64>;
@@ -271,7 +271,7 @@
271271
cache-unified;
272272
};
273273

274-
cluster3_l2: cache@300 {
274+
cluster3_l2: cache-300 {
275275
compatible = "cache";
276276
cache-size = <0x200000>;
277277
cache-line-size = <64>;
@@ -318,7 +318,7 @@
318318
#size-cells = <2>;
319319
ranges;
320320

321-
gic: interrupt-controller@f0000000 {
321+
gic: interrupt-controller@f0800000 {
322322
compatible = "arm,gic-v3";
323323
#interrupt-cells = <3>;
324324
interrupt-controller;
@@ -361,7 +361,7 @@
361361
interrupt-parent = <&gic>;
362362
};
363363

364-
io-fabric {
364+
io-fabric@fc000000 {
365365
compatible = "simple-bus";
366366
#address-cells = <1>;
367367
#size-cells = <1>;

‎arch/arm64/boot/dts/amd/elba-16core.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
1+
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
/*
33
* Copyright 2020-2023 Advanced Micro Devices, Inc.
44
*/

‎arch/arm64/boot/dts/amd/elba-asic-common.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
1+
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
/*
33
* Copyright 2020-2022 Advanced Micro Devices, Inc.
44
*/

‎arch/arm64/boot/dts/amd/elba-asic.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
1+
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
/*
33
* Device Tree file for AMD Pensando Elba Board.
44
*

‎arch/arm64/boot/dts/amd/elba-flash-parts.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
1+
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
/*
33
* Copyright 2020-2023 Advanced Micro Devices, Inc.
44
*/

‎arch/arm64/boot/dts/amd/elba.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
1+
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
/*
33
* Copyright 2020-2022 Advanced Micro Devices, Inc.
44
*/

‎arch/arm64/boot/dts/apm/apm-shadowcat.dtsi‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,13 @@
211211
};
212212
};
213213

214+
refclk: refclk {
215+
compatible = "fixed-clock";
216+
#clock-cells = <1>;
217+
clock-frequency = <100000000>;
218+
clock-output-names = "refclk";
219+
};
220+
214221
pmu {
215222
compatible = "arm,armv8-pmuv3";
216223
interrupts = <1 12 0xff04>;
@@ -236,13 +243,6 @@
236243
#size-cells = <2>;
237244
ranges;
238245

239-
refclk: refclk {
240-
compatible = "fixed-clock";
241-
#clock-cells = <1>;
242-
clock-frequency = <100000000>;
243-
clock-output-names = "refclk";
244-
};
245-
246246
pmdpll: pmdpll@170000f0 {
247247
compatible = "apm,xgene-pcppll-v2-clock";
248248
#clock-cells = <1>;

‎arch/arm64/boot/dts/apm/apm-storm.dtsi‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@
112112
interrupts = <1 9 0xf04>; /* GIC Maintenence IRQ */
113113
};
114114

115+
refclk: refclk {
116+
compatible = "fixed-clock";
117+
#clock-cells = <1>;
118+
clock-frequency = <100000000>;
119+
clock-output-names = "refclk";
120+
};
121+
115122
timer {
116123
compatible = "arm,armv8-timer";
117124
interrupts = <1 0 0xff08>, /* Secure Phys IRQ */
@@ -137,12 +144,6 @@
137144
#address-cells = <2>;
138145
#size-cells = <2>;
139146
ranges;
140-
refclk: refclk {
141-
compatible = "fixed-clock";
142-
#clock-cells = <1>;
143-
clock-frequency = <100000000>;
144-
clock-output-names = "refclk";
145-
};
146147

147148
pcppll: pcppll@17000100 {
148149
compatible = "apm,xgene-pcppll-clock";

‎arch/arm64/boot/dts/arm/juno-base.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,14 +773,14 @@
773773
};
774774
};
775775

776-
big_cluster_thermal_zone: big-cluster-thermal {
776+
big_cluster_thermal_zone: big-cl-thermal {
777777
polling-delay = <1000>;
778778
polling-delay-passive = <100>;
779779
thermal-sensors = <&scpi_sensors0 21>;
780780
status = "disabled";
781781
};
782782

783-
little_cluster_thermal_zone: little-cluster-thermal {
783+
little_cluster_thermal_zone: little-cl-thermal {
784784
polling-delay = <1000>;
785785
polling-delay-passive = <100>;
786786
thermal-sensors = <&scpi_sensors0 22>;

0 commit comments

Comments
 (0)