Skip to content

Commit 75c0dc0

Browse files
geertupalmer-dabbelt
authored andcommitted
riscv: dts: canaan: Group tuples in interrupt properties
To improve human readability and enable automatic validation, the tuples in the various properties containing interrupt specifiers should be grouped. Fix this by grouping the tuples of "interrupts" and "interrupts-extended" properties using angle brackets. Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: Krzysztof Kozlowski <[email protected]> Tested-by: Damien Le Moal <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent fe38b4d commit 75c0dc0

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

arch/riscv/boot/dts/canaan/k210.dtsi

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
clint0: timer@2000000 {
104104
compatible = "canaan,k210-clint", "sifive,clint0";
105105
reg = <0x2000000 0xC000>;
106-
interrupts-extended = <&cpu0_intc 3 &cpu0_intc 7
107-
&cpu1_intc 3 &cpu1_intc 7>;
106+
interrupts-extended = <&cpu0_intc 3>, <&cpu0_intc 7>,
107+
<&cpu1_intc 3>, <&cpu1_intc 7>;
108108
};
109109

110110
plic0: interrupt-controller@c000000 {
@@ -113,7 +113,7 @@
113113
compatible = "canaan,k210-plic", "sifive,plic-1.0.0";
114114
reg = <0xC000000 0x4000000>;
115115
interrupt-controller;
116-
interrupts-extended = <&cpu0_intc 11 &cpu1_intc 11>;
116+
interrupts-extended = <&cpu0_intc 11>, <&cpu1_intc 11>;
117117
riscv,ndev = <65>;
118118
};
119119

@@ -130,18 +130,19 @@
130130
compatible = "canaan,k210-gpiohs", "sifive,gpio0";
131131
reg = <0x38001000 0x1000>;
132132
interrupt-controller;
133-
interrupts = <34 35 36 37 38 39 40 41
134-
42 43 44 45 46 47 48 49
135-
50 51 52 53 54 55 56 57
136-
58 59 60 61 62 63 64 65>;
133+
interrupts = <34>, <35>, <36>, <37>, <38>, <39>, <40>,
134+
<41>, <42>, <43>, <44>, <45>, <46>, <47>,
135+
<48>, <49>, <50>, <51>, <52>, <53>, <54>,
136+
<55>, <56>, <57>, <58>, <59>, <60>, <61>,
137+
<62>, <63>, <64>, <65>;
137138
gpio-controller;
138139
ngpios = <32>;
139140
};
140141

141142
dmac0: dma-controller@50000000 {
142143
compatible = "snps,axi-dma-1.01a";
143144
reg = <0x50000000 0x1000>;
144-
interrupts = <27 28 29 30 31 32>;
145+
interrupts = <27>, <28>, <29>, <30>, <31>, <32>;
145146
#dma-cells = <1>;
146147
clocks = <&sysclk K210_CLK_DMA>, <&sysclk K210_CLK_DMA>;
147148
clock-names = "core-clk", "cfgr-clk";
@@ -316,7 +317,7 @@
316317
timer0: timer@502d0000 {
317318
compatible = "snps,dw-apb-timer";
318319
reg = <0x502D0000 0x100>;
319-
interrupts = <14 15>;
320+
interrupts = <14>, <15>;
320321
clocks = <&sysclk K210_CLK_TIMER0>,
321322
<&sysclk K210_CLK_APB0>;
322323
clock-names = "timer", "pclk";
@@ -326,7 +327,7 @@
326327
timer1: timer@502e0000 {
327328
compatible = "snps,dw-apb-timer";
328329
reg = <0x502E0000 0x100>;
329-
interrupts = <16 17>;
330+
interrupts = <16>, <17>;
330331
clocks = <&sysclk K210_CLK_TIMER1>,
331332
<&sysclk K210_CLK_APB0>;
332333
clock-names = "timer", "pclk";
@@ -336,7 +337,7 @@
336337
timer2: timer@502f0000 {
337338
compatible = "snps,dw-apb-timer";
338339
reg = <0x502F0000 0x100>;
339-
interrupts = <18 19>;
340+
interrupts = <18>, <19>;
340341
clocks = <&sysclk K210_CLK_TIMER2>,
341342
<&sysclk K210_CLK_APB0>;
342343
clock-names = "timer", "pclk";

0 commit comments

Comments
 (0)