Skip to content

Commit e44baca

Browse files
torvaldstorvalds
committed
Merge tag 'arm-fixes-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull arm and RISC-V SoC fixes from Arnd Bergmann: "The Rockchip and IMX8 platforms get a number of fixes for dts files in order to address some misconfigurations, including a regression for USB-C support on some boards. The other dts fixes are part of a series by Rob Herring to clean up another class of dtc compiler warnings across all platforms, with a few others helping out as well. With this, we can enable the warning for the coming merge window without introducing regressions. Conor Dooley has collected fixes for RISC-V platforms, both for the dts files and for platofrm specific drivers. The ep93xx platform gets a regression for for its gpio descriptors" * tag 'arm-fixes-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (28 commits) ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes cache: ax45mp_cache: Align end size to cache boundary in ax45mp_dma_cache_wback() arm64: dts: qcom: Fix interrupt-map cell sizes arm: dts: Fix dtc interrupt_map warnings arm64: dts: Fix dtc interrupt_provider warnings arm: dts: Fix dtc interrupt_provider warnings arm64: dts: freescale: Disable interrupt_map check ARM: ep93xx: Add terminator to gpiod_lookup_table riscv: dts: sifive: add missing #interrupt-cells to pmic arm64: dts: rockchip: Correct Indiedroid Nova GPIO Names arm64: dts: rockchip: Drop interrupts property from rk3328 pwm-rockchip node arm64: dts: rockchip: set num-cs property for spi on px30 arm64: dts: rockchip: minor rk3588 whitespace cleanup riscv: dts: starfive: replace underscores in node names bus: imx-weim: fix valid range check Revert "arm64: dts: imx8mn-var-som-symphony: Describe the USB-C connector" Revert "arm64: dts: imx8mp-dhcom-pdk3: Describe the USB-C connector" arm64: dts: tqma8mpql: fix audio codec iov-supply arm64: dts: rockchip: drop unneeded status from rk3588-jaguar gpio-leds ARM: dts: rockchip: Drop interrupts property from pwm-rockchip nodes ...
2 parents 86f0160 + dcb8e53 commit e44baca

69 files changed

Lines changed: 126 additions & 134 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/arm/boot/dts/amazon/alpine.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167
msix: msix@fbe00000 {
168168
compatible = "al,alpine-msix";
169169
reg = <0x0 0xfbe00000 0x0 0x100000>;
170-
interrupt-controller;
171170
msi-controller;
172171
al,msi-base-spi = <96>;
173172
al,msi-num-spis = <64>;

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@
466466
i2c0: i2c-bus@40 {
467467
#address-cells = <1>;
468468
#size-cells = <0>;
469-
#interrupt-cells = <1>;
470469

471470
reg = <0x40 0x40>;
472471
compatible = "aspeed,ast2400-i2c-bus";
@@ -482,7 +481,6 @@
482481
i2c1: i2c-bus@80 {
483482
#address-cells = <1>;
484483
#size-cells = <0>;
485-
#interrupt-cells = <1>;
486484

487485
reg = <0x80 0x40>;
488486
compatible = "aspeed,ast2400-i2c-bus";
@@ -498,7 +496,6 @@
498496
i2c2: i2c-bus@c0 {
499497
#address-cells = <1>;
500498
#size-cells = <0>;
501-
#interrupt-cells = <1>;
502499

503500
reg = <0xc0 0x40>;
504501
compatible = "aspeed,ast2400-i2c-bus";
@@ -515,7 +512,6 @@
515512
i2c3: i2c-bus@100 {
516513
#address-cells = <1>;
517514
#size-cells = <0>;
518-
#interrupt-cells = <1>;
519515

520516
reg = <0x100 0x40>;
521517
compatible = "aspeed,ast2400-i2c-bus";
@@ -532,7 +528,6 @@
532528
i2c4: i2c-bus@140 {
533529
#address-cells = <1>;
534530
#size-cells = <0>;
535-
#interrupt-cells = <1>;
536531

537532
reg = <0x140 0x40>;
538533
compatible = "aspeed,ast2400-i2c-bus";
@@ -549,7 +544,6 @@
549544
i2c5: i2c-bus@180 {
550545
#address-cells = <1>;
551546
#size-cells = <0>;
552-
#interrupt-cells = <1>;
553547

554548
reg = <0x180 0x40>;
555549
compatible = "aspeed,ast2400-i2c-bus";
@@ -566,7 +560,6 @@
566560
i2c6: i2c-bus@1c0 {
567561
#address-cells = <1>;
568562
#size-cells = <0>;
569-
#interrupt-cells = <1>;
570563

571564
reg = <0x1c0 0x40>;
572565
compatible = "aspeed,ast2400-i2c-bus";
@@ -583,7 +576,6 @@
583576
i2c7: i2c-bus@300 {
584577
#address-cells = <1>;
585578
#size-cells = <0>;
586-
#interrupt-cells = <1>;
587579

588580
reg = <0x300 0x40>;
589581
compatible = "aspeed,ast2400-i2c-bus";
@@ -600,7 +592,6 @@
600592
i2c8: i2c-bus@340 {
601593
#address-cells = <1>;
602594
#size-cells = <0>;
603-
#interrupt-cells = <1>;
604595

605596
reg = <0x340 0x40>;
606597
compatible = "aspeed,ast2400-i2c-bus";
@@ -617,7 +608,6 @@
617608
i2c9: i2c-bus@380 {
618609
#address-cells = <1>;
619610
#size-cells = <0>;
620-
#interrupt-cells = <1>;
621611

622612
reg = <0x380 0x40>;
623613
compatible = "aspeed,ast2400-i2c-bus";
@@ -634,7 +624,6 @@
634624
i2c10: i2c-bus@3c0 {
635625
#address-cells = <1>;
636626
#size-cells = <0>;
637-
#interrupt-cells = <1>;
638627

639628
reg = <0x3c0 0x40>;
640629
compatible = "aspeed,ast2400-i2c-bus";
@@ -651,7 +640,6 @@
651640
i2c11: i2c-bus@400 {
652641
#address-cells = <1>;
653642
#size-cells = <0>;
654-
#interrupt-cells = <1>;
655643

656644
reg = <0x400 0x40>;
657645
compatible = "aspeed,ast2400-i2c-bus";
@@ -668,7 +656,6 @@
668656
i2c12: i2c-bus@440 {
669657
#address-cells = <1>;
670658
#size-cells = <0>;
671-
#interrupt-cells = <1>;
672659

673660
reg = <0x440 0x40>;
674661
compatible = "aspeed,ast2400-i2c-bus";
@@ -685,7 +672,6 @@
685672
i2c13: i2c-bus@480 {
686673
#address-cells = <1>;
687674
#size-cells = <0>;
688-
#interrupt-cells = <1>;
689675

690676
reg = <0x480 0x40>;
691677
compatible = "aspeed,ast2400-i2c-bus";

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@
363363
interrupts = <40>;
364364
reg = <0x1e780200 0x0100>;
365365
clocks = <&syscon ASPEED_CLK_APB>;
366+
#interrupt-cells = <2>;
366367
interrupt-controller;
367368
bus-frequency = <12000000>;
368369
pinctrl-names = "default";
@@ -594,7 +595,6 @@
594595
i2c0: i2c-bus@40 {
595596
#address-cells = <1>;
596597
#size-cells = <0>;
597-
#interrupt-cells = <1>;
598598

599599
reg = <0x40 0x40>;
600600
compatible = "aspeed,ast2500-i2c-bus";
@@ -610,7 +610,6 @@
610610
i2c1: i2c-bus@80 {
611611
#address-cells = <1>;
612612
#size-cells = <0>;
613-
#interrupt-cells = <1>;
614613

615614
reg = <0x80 0x40>;
616615
compatible = "aspeed,ast2500-i2c-bus";
@@ -626,7 +625,6 @@
626625
i2c2: i2c-bus@c0 {
627626
#address-cells = <1>;
628627
#size-cells = <0>;
629-
#interrupt-cells = <1>;
630628

631629
reg = <0xc0 0x40>;
632630
compatible = "aspeed,ast2500-i2c-bus";
@@ -643,7 +641,6 @@
643641
i2c3: i2c-bus@100 {
644642
#address-cells = <1>;
645643
#size-cells = <0>;
646-
#interrupt-cells = <1>;
647644

648645
reg = <0x100 0x40>;
649646
compatible = "aspeed,ast2500-i2c-bus";
@@ -660,7 +657,6 @@
660657
i2c4: i2c-bus@140 {
661658
#address-cells = <1>;
662659
#size-cells = <0>;
663-
#interrupt-cells = <1>;
664660

665661
reg = <0x140 0x40>;
666662
compatible = "aspeed,ast2500-i2c-bus";
@@ -677,7 +673,6 @@
677673
i2c5: i2c-bus@180 {
678674
#address-cells = <1>;
679675
#size-cells = <0>;
680-
#interrupt-cells = <1>;
681676

682677
reg = <0x180 0x40>;
683678
compatible = "aspeed,ast2500-i2c-bus";
@@ -694,7 +689,6 @@
694689
i2c6: i2c-bus@1c0 {
695690
#address-cells = <1>;
696691
#size-cells = <0>;
697-
#interrupt-cells = <1>;
698692

699693
reg = <0x1c0 0x40>;
700694
compatible = "aspeed,ast2500-i2c-bus";
@@ -711,7 +705,6 @@
711705
i2c7: i2c-bus@300 {
712706
#address-cells = <1>;
713707
#size-cells = <0>;
714-
#interrupt-cells = <1>;
715708

716709
reg = <0x300 0x40>;
717710
compatible = "aspeed,ast2500-i2c-bus";
@@ -728,7 +721,6 @@
728721
i2c8: i2c-bus@340 {
729722
#address-cells = <1>;
730723
#size-cells = <0>;
731-
#interrupt-cells = <1>;
732724

733725
reg = <0x340 0x40>;
734726
compatible = "aspeed,ast2500-i2c-bus";
@@ -745,7 +737,6 @@
745737
i2c9: i2c-bus@380 {
746738
#address-cells = <1>;
747739
#size-cells = <0>;
748-
#interrupt-cells = <1>;
749740

750741
reg = <0x380 0x40>;
751742
compatible = "aspeed,ast2500-i2c-bus";
@@ -762,7 +753,6 @@
762753
i2c10: i2c-bus@3c0 {
763754
#address-cells = <1>;
764755
#size-cells = <0>;
765-
#interrupt-cells = <1>;
766756

767757
reg = <0x3c0 0x40>;
768758
compatible = "aspeed,ast2500-i2c-bus";
@@ -779,7 +769,6 @@
779769
i2c11: i2c-bus@400 {
780770
#address-cells = <1>;
781771
#size-cells = <0>;
782-
#interrupt-cells = <1>;
783772

784773
reg = <0x400 0x40>;
785774
compatible = "aspeed,ast2500-i2c-bus";
@@ -796,7 +785,6 @@
796785
i2c12: i2c-bus@440 {
797786
#address-cells = <1>;
798787
#size-cells = <0>;
799-
#interrupt-cells = <1>;
800788

801789
reg = <0x440 0x40>;
802790
compatible = "aspeed,ast2500-i2c-bus";
@@ -813,7 +801,6 @@
813801
i2c13: i2c-bus@480 {
814802
#address-cells = <1>;
815803
#size-cells = <0>;
816-
#interrupt-cells = <1>;
817804

818805
reg = <0x480 0x40>;
819806
compatible = "aspeed,ast2500-i2c-bus";

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@
474474
reg = <0x1e780500 0x100>;
475475
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
476476
clocks = <&syscon ASPEED_CLK_APB2>;
477+
#interrupt-cells = <2>;
477478
interrupt-controller;
478479
bus-frequency = <12000000>;
479480
pinctrl-names = "default";
@@ -488,6 +489,7 @@
488489
reg = <0x1e780600 0x100>;
489490
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
490491
clocks = <&syscon ASPEED_CLK_APB2>;
492+
#interrupt-cells = <2>;
491493
interrupt-controller;
492494
bus-frequency = <12000000>;
493495
pinctrl-names = "default";
@@ -902,7 +904,6 @@
902904
i2c0: i2c-bus@80 {
903905
#address-cells = <1>;
904906
#size-cells = <0>;
905-
#interrupt-cells = <1>;
906907
reg = <0x80 0x80>;
907908
compatible = "aspeed,ast2600-i2c-bus";
908909
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -917,7 +918,6 @@
917918
i2c1: i2c-bus@100 {
918919
#address-cells = <1>;
919920
#size-cells = <0>;
920-
#interrupt-cells = <1>;
921921
reg = <0x100 0x80>;
922922
compatible = "aspeed,ast2600-i2c-bus";
923923
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -932,7 +932,6 @@
932932
i2c2: i2c-bus@180 {
933933
#address-cells = <1>;
934934
#size-cells = <0>;
935-
#interrupt-cells = <1>;
936935
reg = <0x180 0x80>;
937936
compatible = "aspeed,ast2600-i2c-bus";
938937
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -947,7 +946,6 @@
947946
i2c3: i2c-bus@200 {
948947
#address-cells = <1>;
949948
#size-cells = <0>;
950-
#interrupt-cells = <1>;
951949
reg = <0x200 0x80>;
952950
compatible = "aspeed,ast2600-i2c-bus";
953951
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -962,7 +960,6 @@
962960
i2c4: i2c-bus@280 {
963961
#address-cells = <1>;
964962
#size-cells = <0>;
965-
#interrupt-cells = <1>;
966963
reg = <0x280 0x80>;
967964
compatible = "aspeed,ast2600-i2c-bus";
968965
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -977,7 +974,6 @@
977974
i2c5: i2c-bus@300 {
978975
#address-cells = <1>;
979976
#size-cells = <0>;
980-
#interrupt-cells = <1>;
981977
reg = <0x300 0x80>;
982978
compatible = "aspeed,ast2600-i2c-bus";
983979
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -992,7 +988,6 @@
992988
i2c6: i2c-bus@380 {
993989
#address-cells = <1>;
994990
#size-cells = <0>;
995-
#interrupt-cells = <1>;
996991
reg = <0x380 0x80>;
997992
compatible = "aspeed,ast2600-i2c-bus";
998993
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1007,7 +1002,6 @@
10071002
i2c7: i2c-bus@400 {
10081003
#address-cells = <1>;
10091004
#size-cells = <0>;
1010-
#interrupt-cells = <1>;
10111005
reg = <0x400 0x80>;
10121006
compatible = "aspeed,ast2600-i2c-bus";
10131007
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1022,7 +1016,6 @@
10221016
i2c8: i2c-bus@480 {
10231017
#address-cells = <1>;
10241018
#size-cells = <0>;
1025-
#interrupt-cells = <1>;
10261019
reg = <0x480 0x80>;
10271020
compatible = "aspeed,ast2600-i2c-bus";
10281021
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1037,7 +1030,6 @@
10371030
i2c9: i2c-bus@500 {
10381031
#address-cells = <1>;
10391032
#size-cells = <0>;
1040-
#interrupt-cells = <1>;
10411033
reg = <0x500 0x80>;
10421034
compatible = "aspeed,ast2600-i2c-bus";
10431035
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1052,7 +1044,6 @@
10521044
i2c10: i2c-bus@580 {
10531045
#address-cells = <1>;
10541046
#size-cells = <0>;
1055-
#interrupt-cells = <1>;
10561047
reg = <0x580 0x80>;
10571048
compatible = "aspeed,ast2600-i2c-bus";
10581049
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1067,7 +1058,6 @@
10671058
i2c11: i2c-bus@600 {
10681059
#address-cells = <1>;
10691060
#size-cells = <0>;
1070-
#interrupt-cells = <1>;
10711061
reg = <0x600 0x80>;
10721062
compatible = "aspeed,ast2600-i2c-bus";
10731063
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1082,7 +1072,6 @@
10821072
i2c12: i2c-bus@680 {
10831073
#address-cells = <1>;
10841074
#size-cells = <0>;
1085-
#interrupt-cells = <1>;
10861075
reg = <0x680 0x80>;
10871076
compatible = "aspeed,ast2600-i2c-bus";
10881077
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1097,7 +1086,6 @@
10971086
i2c13: i2c-bus@700 {
10981087
#address-cells = <1>;
10991088
#size-cells = <0>;
1100-
#interrupt-cells = <1>;
11011089
reg = <0x700 0x80>;
11021090
compatible = "aspeed,ast2600-i2c-bus";
11031091
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1112,7 +1100,6 @@
11121100
i2c14: i2c-bus@780 {
11131101
#address-cells = <1>;
11141102
#size-cells = <0>;
1115-
#interrupt-cells = <1>;
11161103
reg = <0x780 0x80>;
11171104
compatible = "aspeed,ast2600-i2c-bus";
11181105
clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1127,7 +1114,6 @@
11271114
i2c15: i2c-bus@800 {
11281115
#address-cells = <1>;
11291116
#size-cells = <0>;
1130-
#interrupt-cells = <1>;
11311117
reg = <0x800 0x80>;
11321118
compatible = "aspeed,ast2600-i2c-bus";
11331119
clocks = <&syscon ASPEED_CLK_APB2>;

0 commit comments

Comments
 (0)