Skip to content

Commit fef8451

Browse files
lokeshvutlaMarc Zyngier
authored andcommitted
arm64: dts: k3-am65: ti-sci-inta/intr: Update to latest bindings
Update the INTA and INTR dt nodes to the latest DT bindings. Signed-off-by: Lokesh Vutla <[email protected]> Signed-off-by: Suman Anna <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Acked-by: Nishanth Menon <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 8d523f0 commit fef8451

File tree

4 files changed

+17
-20
lines changed

4 files changed

+17
-20
lines changed

arch/arm64/boot/dts/ti/k3-am65-main.dtsi

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,10 @@
417417
ti,intr-trigger-type = <1>;
418418
interrupt-controller;
419419
interrupt-parent = <&gic500>;
420-
#interrupt-cells = <2>;
420+
#interrupt-cells = <1>;
421421
ti,sci = <&dmsc>;
422-
ti,sci-dst-id = <56>;
423-
ti,sci-rm-range-girq = <0x1>;
422+
ti,sci-dev-id = <100>;
423+
ti,interrupt-ranges = <0 392 32>;
424424
};
425425

426426
main_navss {
@@ -438,10 +438,11 @@
438438
ti,intr-trigger-type = <4>;
439439
interrupt-controller;
440440
interrupt-parent = <&gic500>;
441-
#interrupt-cells = <2>;
441+
#interrupt-cells = <1>;
442442
ti,sci = <&dmsc>;
443-
ti,sci-dst-id = <56>;
444-
ti,sci-rm-range-girq = <0x0>, <0x2>;
443+
ti,sci-dev-id = <182>;
444+
ti,interrupt-ranges = <0 64 64>,
445+
<64 448 64>;
445446
};
446447

447448
inta_main_udmass: interrupt-controller@33d00000 {
@@ -452,8 +453,7 @@
452453
msi-controller;
453454
ti,sci = <&dmsc>;
454455
ti,sci-dev-id = <179>;
455-
ti,sci-rm-range-vint = <0x0>;
456-
ti,sci-rm-range-global-event = <0x1>;
456+
ti,interrupt-ranges = <0 0 256>;
457457
};
458458

459459
secure_proxy_main: mailbox@32c00000 {
@@ -622,7 +622,7 @@
622622
reg-names = "cpts";
623623
clocks = <&main_cpts_mux>;
624624
clock-names = "cpts";
625-
interrupts-extended = <&intr_main_navss 163 0>;
625+
interrupts-extended = <&intr_main_navss 391>;
626626
interrupt-names = "cpts";
627627
ti,cpts-periodic-outputs = <6>;
628628
ti,cpts-ext-ts-inputs = <8>;
@@ -645,8 +645,7 @@
645645
gpio-controller;
646646
#gpio-cells = <2>;
647647
interrupt-parent = <&intr_main_gpio>;
648-
interrupts = <57 256>, <57 257>, <57 258>, <57 259>, <57 260>,
649-
<57 261>;
648+
interrupts = <192>, <193>, <194>, <195>, <196>, <197>;
650649
interrupt-controller;
651650
#interrupt-cells = <2>;
652651
ti,ngpio = <96>;
@@ -661,8 +660,7 @@
661660
gpio-controller;
662661
#gpio-cells = <2>;
663662
interrupt-parent = <&intr_main_gpio>;
664-
interrupts = <58 256>, <58 257>, <58 258>, <58 259>, <58 260>,
665-
<58 261>;
663+
interrupts = <200>, <201>, <202>, <203>, <204>, <205>;
666664
interrupt-controller;
667665
#interrupt-cells = <2>;
668666
ti,ngpio = <90>;

arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@
7474
ti,intr-trigger-type = <1>;
7575
interrupt-controller;
7676
interrupt-parent = <&gic500>;
77-
#interrupt-cells = <2>;
77+
#interrupt-cells = <1>;
7878
ti,sci = <&dmsc>;
79-
ti,sci-dst-id = <56>;
80-
ti,sci-rm-range-girq = <0x4>;
79+
ti,sci-dev-id = <156>;
80+
ti,interrupt-ranges = <0 712 16>;
8181
};
8282

8383
wkup_gpio0: wkup_gpio0@42110000 {
@@ -86,7 +86,7 @@
8686
gpio-controller;
8787
#gpio-cells = <2>;
8888
interrupt-parent = <&intr_wkup_gpio>;
89-
interrupts = <59 128>, <59 129>, <59 130>, <59 131>;
89+
interrupts = <60>, <61>, <62>, <63>;
9090
interrupt-controller;
9191
#interrupt-cells = <2>;
9292
ti,ngpio = <56>;

arch/arm64/boot/dts/ti/k3-am654-base-board.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
};
385385

386386
&mailbox0_cluster0 {
387-
interrupts = <164 0>;
387+
interrupts = <436>;
388388

389389
mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
390390
ti,mbox-tx = <1 0 0>;
@@ -393,7 +393,7 @@
393393
};
394394

395395
&mailbox0_cluster1 {
396-
interrupts = <165 0>;
396+
interrupts = <432>;
397397

398398
mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
399399
ti,mbox-tx = <1 0 0>;

arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
ti,sci = <&dmsc>;
106106
ti,sci-dev-id = <137>;
107107
ti,interrupt-ranges = <16 960 16>;
108-
ti,sci-rm-range-girq = <0x5>;
109108
};
110109

111110
wkup_gpio0: gpio@42110000 {

0 commit comments

Comments
 (0)