Skip to content

Commit 6b82510

Browse files
arndbarndb
committed
Merge tag 'dt64-cleanup-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt
Minor improvements in ARM64 DTS for v6.20 Several minor cleanups for Nuvoton, LG, Spreadtrum, Toshiba, Cavium, ARM and APM SoCs: 1. Switch to recommended node names by fixing style (s/lowercase/hyphen/), using generic naming and adhering to DT bindings. 2. Use consistent whitespaces around. 3. Add missing properties like UART clocks (Cavium Thunder 88xx) or "reg" (APM). 4. Drop incorrect or long time deprecated propeties. 5. Correct clock cells to 0 for fixed-factor-clock clocks. * tag 'dt64-cleanup-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt: arm64: dts: apm: Drop "dma" device_type arm64: dts: apm: Add "reg" to "syscon-reboot" and "syscon-poweroff" arm64: dts: apm: Use recommended i2c node names arm64: dts: apm/shadowcat: More clock clean-ups ARM: dts: vexpress/v2m-rs1: Use documented arm,vexpress,config-bus child node names arm64: dts: cavium: Drop thunder2 arm64: dts: cavium: thunder-88xx: Add missing PL011 "uartclk" arm64: dts: toshiba: Use recommended node names arm64: dts: sprd: Use recommended node names arm64: dts: lg: Use recommended simple-bus node name arm64: dts: nuvoton: npcm845: Minor whitespace cleanup arm64: dts: toshiba: tmpv7708: Align node names with DT bindings Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents ab8292d + 5cd532f commit 6b82510

20 files changed

Lines changed: 42 additions & 214 deletions

‎arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@
420420
compatible = "arm,vexpress,config-bus";
421421
arm,vexpress,config-bridge = <&v2m_sysreg>;
422422

423-
oscclk0 {
423+
clock-controller-0 {
424424
/* MCC static memory clock */
425425
compatible = "arm,vexpress-osc";
426426
arm,vexpress-sysreg,func = <1 0>;
@@ -429,7 +429,7 @@
429429
clock-output-names = "v2m:oscclk0";
430430
};
431431

432-
v2m_oscclk1: oscclk1 {
432+
v2m_oscclk1: clock-controller-1 {
433433
/* CLCD clock */
434434
compatible = "arm,vexpress-osc";
435435
arm,vexpress-sysreg,func = <1 1>;
@@ -438,7 +438,7 @@
438438
clock-output-names = "v2m:oscclk1";
439439
};
440440

441-
v2m_oscclk2: oscclk2 {
441+
v2m_oscclk2: clock-controller-2 {
442442
/* IO FPGA peripheral clock */
443443
compatible = "arm,vexpress-osc";
444444
arm,vexpress-sysreg,func = <1 2>;
@@ -447,7 +447,7 @@
447447
clock-output-names = "v2m:oscclk2";
448448
};
449449

450-
volt-vio {
450+
regulator-vio {
451451
/* Logic level voltage */
452452
compatible = "arm,vexpress-volt";
453453
arm,vexpress-sysreg,func = <2 0>;

‎arch/arm64/boot/dts/apm/apm-merlin.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
poweroff: poweroff@10548010 {
4040
compatible = "syscon-poweroff";
41+
reg = <0x0 0x10548010 0x0 0x4>;
4142
regmap = <&poweroff_mbox>;
4243
offset = <0x10>;
4344
mask = <0x1>;

‎arch/arm64/boot/dts/apm/apm-mustang.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
poweroff: poweroff@10548010 {
4040
compatible = "syscon-poweroff";
41+
reg = <0x0 0x10548010 0x0 0x4>;
4142
regmap = <&poweroff_mbox>;
4243
offset = <0x10>;
4344
mask = <0x1>;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
clock-frequency = <50000000>;
225225
};
226226

227-
i2cslimpro {
227+
i2c {
228228
compatible = "apm,xgene-slimpro-i2c";
229229
mboxes = <&mailbox 0>;
230230
};
@@ -295,7 +295,7 @@
295295

296296
socplldiv2: socplldiv2 {
297297
compatible = "fixed-factor-clock";
298-
#clock-cells = <1>;
298+
#clock-cells = <0>;
299299
clocks = <&socpll 0>;
300300
clock-mult = <1>;
301301
clock-div = <2>;
@@ -305,7 +305,7 @@
305305
ahbclk: ahbclk@17000000 {
306306
compatible = "apm,xgene-device-clock";
307307
#clock-cells = <1>;
308-
clocks = <&socplldiv2 0>;
308+
clocks = <&socplldiv2>;
309309
reg = <0x0 0x17000000 0x0 0x2000>;
310310
reg-names = "div-reg";
311311
divider-offset = <0x164>;
@@ -329,7 +329,7 @@
329329
sdioclk: sdioclk@1f2ac000 {
330330
compatible = "apm,xgene-device-clock";
331331
#clock-cells = <1>;
332-
clocks = <&socplldiv2 0>;
332+
clocks = <&socplldiv2>;
333333
reg = <0x0 0x1f2ac000 0x0 0x1000
334334
0x0 0x17000000 0x0 0x2000>;
335335
reg-names = "csr-reg", "div-reg";
@@ -346,7 +346,7 @@
346346
pcie0clk: pcie0clk@1f2bc000 {
347347
compatible = "apm,xgene-device-clock";
348348
#clock-cells = <1>;
349-
clocks = <&socplldiv2 0>;
349+
clocks = <&socplldiv2>;
350350
reg = <0x0 0x1f2bc000 0x0 0x1000>;
351351
reg-names = "csr-reg";
352352
clock-output-names = "pcie0clk";
@@ -355,7 +355,7 @@
355355
pcie1clk: pcie1clk@1f2cc000 {
356356
compatible = "apm,xgene-device-clock";
357357
#clock-cells = <1>;
358-
clocks = <&socplldiv2 0>;
358+
clocks = <&socplldiv2>;
359359
reg = <0x0 0x1f2cc000 0x0 0x1000>;
360360
reg-names = "csr-reg";
361361
clock-output-names = "pcie1clk";
@@ -364,7 +364,7 @@
364364
xge0clk: xge0clk@1f61c000 {
365365
compatible = "apm,xgene-device-clock";
366366
#clock-cells = <1>;
367-
clocks = <&socplldiv2 0>;
367+
clocks = <&socplldiv2>;
368368
reg = <0x0 0x1f61c000 0x0 0x1000>;
369369
reg-names = "csr-reg";
370370
enable-mask = <0x3>;
@@ -375,7 +375,7 @@
375375
xge1clk: xge1clk@1f62c000 {
376376
compatible = "apm,xgene-device-clock";
377377
#clock-cells = <1>;
378-
clocks = <&socplldiv2 0>;
378+
clocks = <&socplldiv2>;
379379
reg = <0x0 0x1f62c000 0x0 0x1000>;
380380
reg-names = "csr-reg";
381381
enable-mask = <0x3>;
@@ -386,7 +386,7 @@
386386
rngpkaclk: rngpkaclk@17000000 {
387387
compatible = "apm,xgene-device-clock";
388388
#clock-cells = <1>;
389-
clocks = <&socplldiv2 0>;
389+
clocks = <&socplldiv2>;
390390
reg = <0x0 0x17000000 0x0 0x2000>;
391391
reg-names = "csr-reg";
392392
csr-offset = <0xc>;
@@ -417,6 +417,7 @@
417417

418418
reboot: reboot@17000014 {
419419
compatible = "syscon-reboot";
420+
reg = <0x0 0x17000014 0x0 0x4>;
420421
regmap = <&scu>;
421422
offset = <0x14>;
422423
mask = <0x1>;
@@ -799,7 +800,6 @@
799800
compatible = "snps,designware-i2c";
800801
reg = <0x0 0x10511000 0x0 0x1000>;
801802
interrupts = <0 0x45 0x4>;
802-
#clock-cells = <1>;
803803
clocks = <&sbapbclk 0>;
804804
};
805805

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
interrupts = <1 12 0xff04>;
135135
};
136136

137-
i2cslimpro {
137+
i2c {
138138
compatible = "apm,xgene-slimpro-i2c";
139139
mboxes = <&mailbox 0>;
140140
};
@@ -462,6 +462,7 @@
462462

463463
reboot: reboot@17000014 {
464464
compatible = "syscon-reboot";
465+
reg = <0x0 0x17000014 0x0 0x4>;
465466
regmap = <&scu>;
466467
offset = <0x14>;
467468
mask = <0x1>;
@@ -1082,7 +1083,6 @@
10821083

10831084
dma: dma@1f270000 {
10841085
compatible = "apm,xgene-storm-dma";
1085-
device_type = "dma";
10861086
reg = <0x0 0x1f270000 0x0 0x10000>,
10871087
<0x0 0x1f200000 0x0 0x10000>,
10881088
<0x0 0x1b000000 0x0 0x400000>,

‎arch/arm64/boot/dts/cavium/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
3-
dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb

‎arch/arm64/boot/dts/cavium/thunder-88xx.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,16 +401,16 @@
401401
compatible = "arm,pl011", "arm,primecell";
402402
reg = <0x87e0 0x24000000 0x0 0x1000>;
403403
interrupts = <1 21 4>;
404-
clocks = <&refclk50mhz>;
405-
clock-names = "apb_pclk";
404+
clocks = <&refclk50mhz>, <&refclk50mhz>;
405+
clock-names = "uartclk", "apb_pclk";
406406
};
407407

408408
uaa1: serial@87e025000000 {
409409
compatible = "arm,pl011", "arm,primecell";
410410
reg = <0x87e0 0x25000000 0x0 0x1000>;
411411
interrupts = <1 22 4>;
412-
clocks = <&refclk50mhz>;
413-
clock-names = "apb_pclk";
412+
clocks = <&refclk50mhz>, <&refclk50mhz>;
413+
clock-names = "uartclk", "apb_pclk";
414414
};
415415
};
416416
};

‎arch/arm64/boot/dts/cavium/thunder2-99xx.dts‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi‎

Lines changed: 0 additions & 144 deletions
This file was deleted.

‎arch/arm64/boot/dts/lg/lg131x.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
clock-output-names = "BUSCLK";
103103
};
104104

105-
amba {
105+
amba-bus {
106106
#address-cells = <2>;
107107
#size-cells = <1>;
108108

0 commit comments

Comments
 (0)