Skip to content

Commit 7120733

Browse files
arndbarndb
committed
Merge tag 'dt-cleanup-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt
Minor improvements in ARM DTS for v6.11 Few cleanups and improvements which were missed by their maintainers: 1. Add Krzysztof as odd-fixer for old ARM platforms: Alphascale, AXM LSI, Moxa, TI Nspire and VT8500 (with Alexey Charkov). 2. VT8500: align node names with bindings (USB, panel timings). 3. Cirrus: align node names with bindings (panel timings). 4. TI Nspire: correct unit addresses, correct watchdog compatible and properties while making it disabled (never tested). 5. Nuvoton, Aspeed: align node names with bindings (I2C). IMPORTANT: At least for Aspeed it is known to affect some user-space tools, because that user-space looks for specific node path via /sys/firmware/devicetree. The /sys/firmware/devicetree is not the ABI and any user-space relying on it: - Prevents any changes in DTS, e.g. node renaming or moving, changing unit addresses (re-arranging child bus addressing). - Is using undocumented interface. - Is neither reliable nor understandable. 6. TI OMAP and Davinci: align node names with bindings (panel timings), drop incorrect property. 7. STI: document in bindings codec child to fix dtbs_checks. * tag 'dt-cleanup-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt: ARM: dts: omap am5729-beagleboneai: drop unneeded ti,enable-id-detection dt-bindings: soc: sti: st,sti-syscon: document codec node ARM: dts: ti: align panel timings node name with dtschema arm: dts: aspeed: Use standard 'i2c' bus node name arm: dts: nuvoton: Use standard 'i2c' bus node name MAINTAINERS: ARM: alphascale: add Krzysztof Kozlowski as maintainer ARM: dts: nspire: Add full compatible for watchdog node ARM: dts: nspire: Add unit name addresses to memory nodes MAINTAINERS: ARM: nspire: add Krzysztof Kozlowski as maintainer MAINTAINERS: ARM: vt8500: add Alexey and Krzysztof as maintainers MAINTAINERS: ARM: axm: add Krzysztof Kozlowski as maintainer MAINTAINERS: ARM: moxa: add Krzysztof Kozlowski as maintainer ARM: dts: cirrus: align panel timings node name with dtschema ARM: dts: vt8500: align panel timings node name with dtschema ARM: dts: vt8500: replace "uhci" nodename with generic name "usb" Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 90a4146 + 90b6de4 commit 7120733

25 files changed

+137
-87
lines changed

‎Documentation/devicetree/bindings/soc/sti/st,sti-syscon.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ properties:
3030
reg:
3131
maxItems: 1
3232

33+
sti-sasg-codec:
34+
description: STi internal audio codec
35+
type: object
36+
additionalProperties: true
37+
38+
properties:
39+
compatible:
40+
const: st,stih407-sas-codec
41+
3342
required:
3443
- compatible
3544
- reg

‎MAINTAINERS

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1930,6 +1930,16 @@ N: allwinner
19301930
N: sun[x456789]i
19311931
N: sun[25]0i
19321932

1933+
ARM/ALPHASCALE ARCHITECTURE
1934+
M: Krzysztof Kozlowski <[email protected]>
1935+
L: [email protected] (moderated for non-subscribers)
1936+
S: Odd Fixes
1937+
F: arch/arm/boot/dts/alphascale/
1938+
F: drivers/clk/clk-asm9260.c
1939+
F: drivers/clocksource/asm9260_timer.c
1940+
F: drivers/rtc/rtc-asm9260.c
1941+
F: drivers/watchdog/asm9260_wdt.c
1942+
19331943
ARM/AMD PENSANDO ARM64 ARCHITECTURE
19341944
M: Brad Larson <[email protected]>
19351945
L: [email protected] (moderated for non-subscribers)
@@ -2093,6 +2103,14 @@ F: arch/arm/boot/dts/aspeed/
20932103
F: arch/arm/mach-aspeed/
20942104
N: aspeed
20952105

2106+
ARM/AXM LSI SOC
2107+
M: Krzysztof Kozlowski <[email protected]>
2108+
L: [email protected] (moderated for non-subscribers)
2109+
S: Odd Fixes
2110+
F: Documentation/devicetree/bindings/arm/axxia.yaml
2111+
F: arch/arm/boot/dts/intel/axm/
2112+
F: arch/arm/mach-axxia/
2113+
20962114
ARM/BITMAIN ARCHITECTURE
20972115
M: Manivannan Sadhasivam <[email protected]>
20982116
L: [email protected] (moderated for non-subscribers)
@@ -2524,6 +2542,15 @@ F: arch/arm/boot/dts/socionext/milbeaut*
25242542
F: arch/arm/mach-milbeaut/
25252543
N: milbeaut
25262544

2545+
ARM/MOXA ART SOC
2546+
M: Krzysztof Kozlowski <[email protected]>
2547+
L: [email protected] (moderated for non-subscribers)
2548+
S: Odd Fixes
2549+
F: Documentation/devicetree/bindings/arm/moxart.yaml
2550+
F: Documentation/devicetree/bindings/clock/moxa,moxart-clock.txt
2551+
F: arch/arm/boot/dts/moxa/
2552+
F: drivers/clk/clk-moxart.c
2553+
25272554
ARM/MStar/Sigmastar Armv7 SoC support
25282555
M: Daniel Palmer <[email protected]>
25292556
M: Romain Perier <[email protected]>
@@ -3034,6 +3061,15 @@ F: Documentation/devicetree/bindings/hwinfo/ti,k3-socinfo.yaml
30343061
F: arch/arm64/boot/dts/ti/Makefile
30353062
F: arch/arm64/boot/dts/ti/k3-*
30363063

3064+
ARM/TEXAS INSTRUMENTS NSPIRE ARCHITECTURE
3065+
M: Krzysztof Kozlowski <[email protected]>
3066+
L: [email protected] (moderated for non-subscribers)
3067+
S: Odd Fixes
3068+
F: Documentation/devicetree/bindings/*/*/ti,nspire*
3069+
F: Documentation/devicetree/bindings/*/ti,nspire*
3070+
F: Documentation/devicetree/bindings/arm/ti/nspire.yaml
3071+
F: arch/arm/boot/dts/nspire/
3072+
30373073
ARM/TOSHIBA VISCONTI ARCHITECTURE
30383074
M: Nobuhiro Iwamatsu <[email protected]>
30393075
L: [email protected] (moderated for non-subscribers)
@@ -3103,9 +3139,12 @@ W: http://www.armlinux.org.uk/
31033139
F: arch/arm/vfp/
31043140

31053141
ARM/VT8500 ARM ARCHITECTURE
3142+
M: Alexey Charkov <[email protected]>
3143+
M: Krzysztof Kozlowski <[email protected]>
31063144
L: [email protected] (moderated for non-subscribers)
3107-
S: Orphan
3145+
S: Odd Fixes
31083146
F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt
3147+
F: arch/arm/boot/dts/vt8500/
31093148
F: arch/arm/mach-vt8500/
31103149
F: drivers/clocksource/timer-vt8500.c
31113150
F: drivers/i2c/busses/i2c-viai2c-wmt.c

‎arch/arm/boot/dts/aspeed/aspeed-g4.dtsi

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@
463463
interrupt-controller;
464464
};
465465

466-
i2c0: i2c-bus@40 {
466+
i2c0: i2c@40 {
467467
#address-cells = <1>;
468468
#size-cells = <0>;
469469

@@ -478,7 +478,7 @@
478478
/* Does not need pinctrl properties */
479479
};
480480

481-
i2c1: i2c-bus@80 {
481+
i2c1: i2c@80 {
482482
#address-cells = <1>;
483483
#size-cells = <0>;
484484

@@ -493,7 +493,7 @@
493493
/* Does not need pinctrl properties */
494494
};
495495

496-
i2c2: i2c-bus@c0 {
496+
i2c2: i2c@c0 {
497497
#address-cells = <1>;
498498
#size-cells = <0>;
499499

@@ -509,7 +509,7 @@
509509
status = "disabled";
510510
};
511511

512-
i2c3: i2c-bus@100 {
512+
i2c3: i2c@100 {
513513
#address-cells = <1>;
514514
#size-cells = <0>;
515515

@@ -525,7 +525,7 @@
525525
status = "disabled";
526526
};
527527

528-
i2c4: i2c-bus@140 {
528+
i2c4: i2c@140 {
529529
#address-cells = <1>;
530530
#size-cells = <0>;
531531

@@ -541,7 +541,7 @@
541541
status = "disabled";
542542
};
543543

544-
i2c5: i2c-bus@180 {
544+
i2c5: i2c@180 {
545545
#address-cells = <1>;
546546
#size-cells = <0>;
547547

@@ -557,7 +557,7 @@
557557
status = "disabled";
558558
};
559559

560-
i2c6: i2c-bus@1c0 {
560+
i2c6: i2c@1c0 {
561561
#address-cells = <1>;
562562
#size-cells = <0>;
563563

@@ -573,7 +573,7 @@
573573
status = "disabled";
574574
};
575575

576-
i2c7: i2c-bus@300 {
576+
i2c7: i2c@300 {
577577
#address-cells = <1>;
578578
#size-cells = <0>;
579579

@@ -589,7 +589,7 @@
589589
status = "disabled";
590590
};
591591

592-
i2c8: i2c-bus@340 {
592+
i2c8: i2c@340 {
593593
#address-cells = <1>;
594594
#size-cells = <0>;
595595

@@ -605,7 +605,7 @@
605605
status = "disabled";
606606
};
607607

608-
i2c9: i2c-bus@380 {
608+
i2c9: i2c@380 {
609609
#address-cells = <1>;
610610
#size-cells = <0>;
611611

@@ -621,7 +621,7 @@
621621
status = "disabled";
622622
};
623623

624-
i2c10: i2c-bus@3c0 {
624+
i2c10: i2c@3c0 {
625625
#address-cells = <1>;
626626
#size-cells = <0>;
627627

@@ -637,7 +637,7 @@
637637
status = "disabled";
638638
};
639639

640-
i2c11: i2c-bus@400 {
640+
i2c11: i2c@400 {
641641
#address-cells = <1>;
642642
#size-cells = <0>;
643643

@@ -653,7 +653,7 @@
653653
status = "disabled";
654654
};
655655

656-
i2c12: i2c-bus@440 {
656+
i2c12: i2c@440 {
657657
#address-cells = <1>;
658658
#size-cells = <0>;
659659

@@ -669,7 +669,7 @@
669669
status = "disabled";
670670
};
671671

672-
i2c13: i2c-bus@480 {
672+
i2c13: i2c@480 {
673673
#address-cells = <1>;
674674
#size-cells = <0>;
675675

‎arch/arm/boot/dts/aspeed/aspeed-g5.dtsi

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@
592592
interrupt-controller;
593593
};
594594

595-
i2c0: i2c-bus@40 {
595+
i2c0: i2c@40 {
596596
#address-cells = <1>;
597597
#size-cells = <0>;
598598

@@ -607,7 +607,7 @@
607607
/* Does not need pinctrl properties */
608608
};
609609

610-
i2c1: i2c-bus@80 {
610+
i2c1: i2c@80 {
611611
#address-cells = <1>;
612612
#size-cells = <0>;
613613

@@ -622,7 +622,7 @@
622622
/* Does not need pinctrl properties */
623623
};
624624

625-
i2c2: i2c-bus@c0 {
625+
i2c2: i2c@c0 {
626626
#address-cells = <1>;
627627
#size-cells = <0>;
628628

@@ -638,7 +638,7 @@
638638
status = "disabled";
639639
};
640640

641-
i2c3: i2c-bus@100 {
641+
i2c3: i2c@100 {
642642
#address-cells = <1>;
643643
#size-cells = <0>;
644644

@@ -654,7 +654,7 @@
654654
status = "disabled";
655655
};
656656

657-
i2c4: i2c-bus@140 {
657+
i2c4: i2c@140 {
658658
#address-cells = <1>;
659659
#size-cells = <0>;
660660

@@ -670,7 +670,7 @@
670670
status = "disabled";
671671
};
672672

673-
i2c5: i2c-bus@180 {
673+
i2c5: i2c@180 {
674674
#address-cells = <1>;
675675
#size-cells = <0>;
676676

@@ -686,7 +686,7 @@
686686
status = "disabled";
687687
};
688688

689-
i2c6: i2c-bus@1c0 {
689+
i2c6: i2c@1c0 {
690690
#address-cells = <1>;
691691
#size-cells = <0>;
692692

@@ -702,7 +702,7 @@
702702
status = "disabled";
703703
};
704704

705-
i2c7: i2c-bus@300 {
705+
i2c7: i2c@300 {
706706
#address-cells = <1>;
707707
#size-cells = <0>;
708708

@@ -718,7 +718,7 @@
718718
status = "disabled";
719719
};
720720

721-
i2c8: i2c-bus@340 {
721+
i2c8: i2c@340 {
722722
#address-cells = <1>;
723723
#size-cells = <0>;
724724

@@ -734,7 +734,7 @@
734734
status = "disabled";
735735
};
736736

737-
i2c9: i2c-bus@380 {
737+
i2c9: i2c@380 {
738738
#address-cells = <1>;
739739
#size-cells = <0>;
740740

@@ -750,7 +750,7 @@
750750
status = "disabled";
751751
};
752752

753-
i2c10: i2c-bus@3c0 {
753+
i2c10: i2c@3c0 {
754754
#address-cells = <1>;
755755
#size-cells = <0>;
756756

@@ -766,7 +766,7 @@
766766
status = "disabled";
767767
};
768768

769-
i2c11: i2c-bus@400 {
769+
i2c11: i2c@400 {
770770
#address-cells = <1>;
771771
#size-cells = <0>;
772772

@@ -782,7 +782,7 @@
782782
status = "disabled";
783783
};
784784

785-
i2c12: i2c-bus@440 {
785+
i2c12: i2c@440 {
786786
#address-cells = <1>;
787787
#size-cells = <0>;
788788

@@ -798,7 +798,7 @@
798798
status = "disabled";
799799
};
800800

801-
i2c13: i2c-bus@480 {
801+
i2c13: i2c@480 {
802802
#address-cells = <1>;
803803
#size-cells = <0>;
804804

0 commit comments

Comments
 (0)