Skip to content

Commit 8d523f0

Browse files
lokeshvutlaMarc Zyngier
authored andcommitted
arm64: dts: k3-j721e: 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: Marc Zyngier <[email protected]> Acked-by: Nishanth Menon <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 5c4b585 commit 8d523f0

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
};
288288

289289
&mailbox0_cluster0 {
290-
interrupts = <214 0>;
290+
interrupts = <436>;
291291

292292
mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
293293
ti,mbox-rx = <0 0 0>;
@@ -301,7 +301,7 @@
301301
};
302302

303303
&mailbox0_cluster1 {
304-
interrupts = <215 0>;
304+
interrupts = <432>;
305305

306306
mbox_main_r5fss0_core0: mbox-main-r5fss0-core0 {
307307
ti,mbox-rx = <0 0 0>;
@@ -315,7 +315,7 @@
315315
};
316316

317317
&mailbox0_cluster2 {
318-
interrupts = <216 0>;
318+
interrupts = <428>;
319319

320320
mbox_main_r5fss1_core0: mbox-main-r5fss1-core0 {
321321
ti,mbox-rx = <0 0 0>;
@@ -329,7 +329,7 @@
329329
};
330330

331331
&mailbox0_cluster3 {
332-
interrupts = <217 0>;
332+
interrupts = <424>;
333333

334334
mbox_c66_0: mbox-c66-0 {
335335
ti,mbox-rx = <0 0 0>;
@@ -343,7 +343,7 @@
343343
};
344344

345345
&mailbox0_cluster4 {
346-
interrupts = <218 0>;
346+
interrupts = <420>;
347347

348348
mbox_c71_0: mbox-c71-0 {
349349
ti,mbox-rx = <0 0 0>;

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

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@
8080
ti,intr-trigger-type = <1>;
8181
interrupt-controller;
8282
interrupt-parent = <&gic500>;
83-
#interrupt-cells = <2>;
83+
#interrupt-cells = <1>;
8484
ti,sci = <&dmsc>;
85-
ti,sci-dst-id = <14>;
86-
ti,sci-rm-range-girq = <0x1>;
85+
ti,sci-dev-id = <131>;
86+
ti,interrupt-ranges = <8 392 56>;
8787
};
8888

8989
main_navss {
@@ -101,10 +101,12 @@
101101
ti,intr-trigger-type = <4>;
102102
interrupt-controller;
103103
interrupt-parent = <&gic500>;
104-
#interrupt-cells = <2>;
104+
#interrupt-cells = <1>;
105105
ti,sci = <&dmsc>;
106-
ti,sci-dst-id = <14>;
107-
ti,sci-rm-range-girq = <0>, <2>;
106+
ti,sci-dev-id = <213>;
107+
ti,interrupt-ranges = <0 64 64>,
108+
<64 448 64>,
109+
<128 672 64>;
108110
};
109111

110112
main_udmass_inta: interrupt-controller@33d00000 {
@@ -115,8 +117,7 @@
115117
msi-controller;
116118
ti,sci = <&dmsc>;
117119
ti,sci-dev-id = <209>;
118-
ti,sci-rm-range-vint = <0xa>;
119-
ti,sci-rm-range-global-event = <0xd>;
120+
ti,interrupt-ranges = <0 0 256>;
120121
};
121122

122123
secure_proxy_main: mailbox@32c00000 {
@@ -296,7 +297,7 @@
296297
reg-names = "cpts";
297298
clocks = <&k3_clks 201 1>;
298299
clock-names = "cpts";
299-
interrupts-extended = <&main_navss_intr 201 0>;
300+
interrupts-extended = <&main_navss_intr 391>;
300301
interrupt-names = "cpts";
301302
ti,cpts-periodic-outputs = <6>;
302303
ti,cpts-ext-ts-inputs = <8>;
@@ -688,8 +689,8 @@
688689
gpio-controller;
689690
#gpio-cells = <2>;
690691
interrupt-parent = <&main_gpio_intr>;
691-
interrupts = <105 0>, <105 1>, <105 2>, <105 3>,
692-
<105 4>, <105 5>, <105 6>, <105 7>;
692+
interrupts = <256>, <257>, <258>, <259>,
693+
<260>, <261>, <262>, <263>;
693694
interrupt-controller;
694695
#interrupt-cells = <2>;
695696
ti,ngpio = <128>;
@@ -705,7 +706,7 @@
705706
gpio-controller;
706707
#gpio-cells = <2>;
707708
interrupt-parent = <&main_gpio_intr>;
708-
interrupts = <106 0>, <106 1>, <106 2>;
709+
interrupts = <288>, <289>, <290>;
709710
interrupt-controller;
710711
#interrupt-cells = <2>;
711712
ti,ngpio = <36>;
@@ -721,8 +722,8 @@
721722
gpio-controller;
722723
#gpio-cells = <2>;
723724
interrupt-parent = <&main_gpio_intr>;
724-
interrupts = <107 0>, <107 1>, <107 2>, <107 3>,
725-
<107 4>, <107 5>, <107 6>, <107 7>;
725+
interrupts = <264>, <265>, <266>, <267>,
726+
<268>, <269>, <270>, <271>;
726727
interrupt-controller;
727728
#interrupt-cells = <2>;
728729
ti,ngpio = <128>;
@@ -738,7 +739,7 @@
738739
gpio-controller;
739740
#gpio-cells = <2>;
740741
interrupt-parent = <&main_gpio_intr>;
741-
interrupts = <108 0>, <108 1>, <108 2>;
742+
interrupts = <292>, <293>, <294>;
742743
interrupt-controller;
743744
#interrupt-cells = <2>;
744745
ti,ngpio = <36>;
@@ -754,8 +755,8 @@
754755
gpio-controller;
755756
#gpio-cells = <2>;
756757
interrupt-parent = <&main_gpio_intr>;
757-
interrupts = <109 0>, <109 1>, <109 2>, <109 3>,
758-
<109 4>, <109 5>, <109 6>, <109 7>;
758+
interrupts = <272>, <273>, <274>, <275>,
759+
<276>, <277>, <278>, <279>;
759760
interrupt-controller;
760761
#interrupt-cells = <2>;
761762
ti,ngpio = <128>;
@@ -771,7 +772,7 @@
771772
gpio-controller;
772773
#gpio-cells = <2>;
773774
interrupt-parent = <&main_gpio_intr>;
774-
interrupts = <110 0>, <110 1>, <110 2>;
775+
interrupts = <296>, <297>, <298>;
775776
interrupt-controller;
776777
#interrupt-cells = <2>;
777778
ti,ngpio = <36>;
@@ -787,8 +788,8 @@
787788
gpio-controller;
788789
#gpio-cells = <2>;
789790
interrupt-parent = <&main_gpio_intr>;
790-
interrupts = <111 0>, <111 1>, <111 2>, <111 3>,
791-
<111 4>, <111 5>, <111 6>, <111 7>;
791+
interrupts = <280>, <281>, <282>, <283>,
792+
<284>, <285>, <286>, <287>;
792793
interrupt-controller;
793794
#interrupt-cells = <2>;
794795
ti,ngpio = <128>;
@@ -804,7 +805,7 @@
804805
gpio-controller;
805806
#gpio-cells = <2>;
806807
interrupt-parent = <&main_gpio_intr>;
807-
interrupts = <112 0>, <112 1>, <112 2>;
808+
interrupts = <300>, <301>, <302>;
808809
interrupt-controller;
809810
#interrupt-cells = <2>;
810811
ti,ngpio = <36>;

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,10 @@
101101
ti,intr-trigger-type = <1>;
102102
interrupt-controller;
103103
interrupt-parent = <&gic500>;
104-
#interrupt-cells = <2>;
104+
#interrupt-cells = <1>;
105105
ti,sci = <&dmsc>;
106-
ti,sci-dst-id = <14>;
106+
ti,sci-dev-id = <137>;
107+
ti,interrupt-ranges = <16 960 16>;
107108
ti,sci-rm-range-girq = <0x5>;
108109
};
109110

@@ -113,8 +114,7 @@
113114
gpio-controller;
114115
#gpio-cells = <2>;
115116
interrupt-parent = <&wkup_gpio_intr>;
116-
interrupts = <113 0>, <113 1>, <113 2>,
117-
<113 3>, <113 4>, <113 5>;
117+
interrupts = <103>, <104>, <105>, <106>, <107>, <108>;
118118
interrupt-controller;
119119
#interrupt-cells = <2>;
120120
ti,ngpio = <84>;
@@ -130,8 +130,7 @@
130130
gpio-controller;
131131
#gpio-cells = <2>;
132132
interrupt-parent = <&wkup_gpio_intr>;
133-
interrupts = <114 0>, <114 1>, <114 2>,
134-
<114 3>, <114 4>, <114 5>;
133+
interrupts = <112>, <113>, <114>, <115>, <116>, <117>;
135134
interrupt-controller;
136135
#interrupt-cells = <2>;
137136
ti,ngpio = <84>;

0 commit comments

Comments
 (0)