Skip to content

Commit 0d4c5c6

Browse files
biwenlibiwenli
committed
dts: xtensa: nxp: update interrupt-cells
Update interrupt-cells of imx8, imx8m, imx8qm, imx8qxp. Signed-off-by: Biwen Li <[email protected]>
1 parent dc34845 commit 0d4c5c6

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎dts/xtensa/nxp/nxp_imx8.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@
132132
valid-channels = <6>, <7>, <14>, <15>;
133133
power-domains = <&edma0_ch6_pd>, <&edma0_ch7_pd>,
134134
<&edma0_ch14_pd>, <&edma0_ch15_pd>;
135-
interrupts-extended = <&master6 58>, <&master6 58>,
136-
<&master5 29>, <&master5 29>;
135+
interrupts-extended = <&master6 58 0>, <&master6 58 0>,
136+
<&master5 29 0>, <&master5 29 0>;
137137
#dma-cells = <2>;
138138
status = "disabled";
139139
};
@@ -142,7 +142,7 @@
142142
compatible = "nxp,dai-sai";
143143
reg = <0x59050000 DT_SIZE_K(64)>;
144144
interrupt-parent = <&master5>;
145-
interrupts = <28>;
145+
interrupts = <28 0>;
146146
clocks = <&ccm IMX_CCM_SAI1_CLK 0x0 0x0>;
147147
clock-names = "bus";
148148
dai-index = <1>;
@@ -176,7 +176,7 @@
176176
compatible = "nxp,imx-lpuart", "nxp,lpuart";
177177
reg = <0x5a080000 DT_SIZE_K(4)>;
178178
interrupt-parent = <&master4>;
179-
interrupts = <3>;
179+
interrupts = <3 0>;
180180
/* this is actually LPUART2 clock but the macro indexing starts at 1 */
181181
clocks = <&ccm IMX_CCM_LPUART3_CLK 0x0 0x0>;
182182
status = "disabled";

‎dts/xtensa/nxp/nxp_imx8m.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,23 @@
6060
compatible = "nxp,irqsteer-master";
6161
reg = <0>;
6262
interrupt-controller;
63-
#interrupt-cells = <1>;
63+
#interrupt-cells = <2>;
6464
interrupts-extended = <&clic 19 0 0>;
6565
};
6666

6767
master1: interrupt-controller@1 {
6868
compatible = "nxp,irqsteer-master";
6969
reg = <1>;
7070
interrupt-controller;
71-
#interrupt-cells = <1>;
71+
#interrupt-cells = <2>;
7272
interrupts-extended = <&clic 20 0 0>;
7373
};
7474

7575
master2: interrupt-controller@2 {
7676
compatible = "nxp,irqsteer-master";
7777
reg = <2>;
7878
interrupt-controller;
79-
#interrupt-cells = <1>;
79+
#interrupt-cells = <2>;
8080
interrupts-extended = <&clic 21 0 0>;
8181
};
8282
};
@@ -91,7 +91,7 @@
9191
compatible = "nxp,sdma";
9292
reg = <0x30e00000 DT_SIZE_K(64)>;
9393
interrupt-parent = <&master1>;
94-
interrupts = <2 0 0>;
94+
interrupts = <2 0>;
9595
#dma-cells = <2>;
9696
status = "disabled";
9797
};
@@ -105,7 +105,7 @@
105105
clock-names = "mclk1";
106106

107107
interrupt-parent = <&master1>;
108-
interrupts = <18>;
108+
interrupts = <18 0>;
109109
dai-index = <3>;
110110
/* DMA event source, peripheral type */
111111
dmas = <&sdma3 5 5>, <&sdma3 4 5>;
@@ -143,7 +143,7 @@
143143
* until we can support UART interrupts
144144
*/
145145
interrupt-parent = <&master0>;
146-
interrupts = <29 0 0>;
146+
interrupts = <29 0>;
147147
clocks = <&ccm IMX_CCM_UART4_CLK 0x6c 24>;
148148
status = "disabled";
149149
};

‎dts/xtensa/nxp/nxp_imx8qm.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,63 +20,63 @@
2020
compatible = "nxp,irqsteer-master";
2121
reg = <0>;
2222
interrupt-controller;
23-
#interrupt-cells = <1>;
23+
#interrupt-cells = <2>;
2424
interrupts-extended = <&clic 19 0 0>;
2525
};
2626

2727
master1: interrupt-controller@1 {
2828
compatible = "nxp,irqsteer-master";
2929
reg = <1>;
3030
interrupt-controller;
31-
#interrupt-cells = <1>;
31+
#interrupt-cells = <2>;
3232
interrupts-extended = <&clic 20 0 0>;
3333
};
3434

3535
master2: interrupt-controller@2 {
3636
compatible = "nxp,irqsteer-master";
3737
reg = <2>;
3838
interrupt-controller;
39-
#interrupt-cells = <1>;
39+
#interrupt-cells = <2>;
4040
interrupts-extended = <&clic 21 0 0>;
4141
};
4242

4343
master3: interrupt-controller@3 {
4444
compatible = "nxp,irqsteer-master";
4545
reg = <3>;
4646
interrupt-controller;
47-
#interrupt-cells = <1>;
47+
#interrupt-cells = <2>;
4848
interrupts-extended = <&clic 22 0 0>;
4949
};
5050

5151
master4: interrupt-controller@4 {
5252
compatible = "nxp,irqsteer-master";
5353
reg = <4>;
5454
interrupt-controller;
55-
#interrupt-cells = <1>;
55+
#interrupt-cells = <2>;
5656
interrupts-extended = <&clic 23 0 0>;
5757
};
5858

5959
master5: interrupt-controller@5 {
6060
compatible = "nxp,irqsteer-master";
6161
reg = <5>;
6262
interrupt-controller;
63-
#interrupt-cells = <1>;
63+
#interrupt-cells = <2>;
6464
interrupts-extended = <&clic 24 0 0>;
6565
};
6666

6767
master6: interrupt-controller@6 {
6868
compatible = "nxp,irqsteer-master";
6969
reg = <6>;
7070
interrupt-controller;
71-
#interrupt-cells = <1>;
71+
#interrupt-cells = <2>;
7272
interrupts-extended = <&clic 25 0 0>;
7373
};
7474

7575
master7: interrupt-controller@7 {
7676
compatible = "nxp,irqsteer-master";
7777
reg = <7>;
7878
interrupt-controller;
79-
#interrupt-cells = <1>;
79+
#interrupt-cells = <2>;
8080
interrupts-extended = <&clic 26 0 0>;
8181
};
8282
};

‎dts/xtensa/nxp/nxp_imx8qxp.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,63 +19,63 @@
1919
compatible = "nxp,irqsteer-master";
2020
reg = <0>;
2121
interrupt-controller;
22-
#interrupt-cells = <1>;
22+
#interrupt-cells = <2>;
2323
interrupts-extended = <&clic 19 0 0>;
2424
};
2525

2626
master1: interrupt-controller@1 {
2727
compatible = "nxp,irqsteer-master";
2828
reg = <1>;
2929
interrupt-controller;
30-
#interrupt-cells = <1>;
30+
#interrupt-cells = <2>;
3131
interrupts-extended = <&clic 20 0 0>;
3232
};
3333

3434
master2: interrupt-controller@2 {
3535
compatible = "nxp,irqsteer-master";
3636
reg = <2>;
3737
interrupt-controller;
38-
#interrupt-cells = <1>;
38+
#interrupt-cells = <2>;
3939
interrupts-extended = <&clic 21 0 0>;
4040
};
4141

4242
master3: interrupt-controller@3 {
4343
compatible = "nxp,irqsteer-master";
4444
reg = <3>;
4545
interrupt-controller;
46-
#interrupt-cells = <1>;
46+
#interrupt-cells = <2>;
4747
interrupts-extended = <&clic 22 0 0>;
4848
};
4949

5050
master4: interrupt-controller@4 {
5151
compatible = "nxp,irqsteer-master";
5252
reg = <4>;
5353
interrupt-controller;
54-
#interrupt-cells = <1>;
54+
#interrupt-cells = <2>;
5555
interrupts-extended = <&clic 23 0 0>;
5656
};
5757

5858
master5: interrupt-controller@5 {
5959
compatible = "nxp,irqsteer-master";
6060
reg = <5>;
6161
interrupt-controller;
62-
#interrupt-cells = <1>;
62+
#interrupt-cells = <2>;
6363
interrupts-extended = <&clic 24 0 0>;
6464
};
6565

6666
master6: interrupt-controller@6 {
6767
compatible = "nxp,irqsteer-master";
6868
reg = <6>;
6969
interrupt-controller;
70-
#interrupt-cells = <1>;
70+
#interrupt-cells = <2>;
7171
interrupts-extended = <&clic 25 0 0>;
7272
};
7373

7474
master7: interrupt-controller@7 {
7575
compatible = "nxp,irqsteer-master";
7676
reg = <7>;
7777
interrupt-controller;
78-
#interrupt-cells = <1>;
78+
#interrupt-cells = <2>;
7979
interrupts-extended = <&clic 26 0 0>;
8080
};
8181
};

0 commit comments

Comments
 (0)