Skip to content

Commit cc79be0

Browse files
geertupalmer-dabbelt
authored andcommitted
riscv: dts: sifive: 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: Krzysztof Kozlowski <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent e35b07a commit cc79be0

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

arch/riscv/boot/dts/sifive/fu540-c000.dtsi

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@
145145
reg = <0x0 0xc000000 0x0 0x4000000>;
146146
riscv,ndev = <53>;
147147
interrupt-controller;
148-
interrupts-extended = <
149-
&cpu0_intc 0xffffffff
150-
&cpu1_intc 0xffffffff &cpu1_intc 9
151-
&cpu2_intc 0xffffffff &cpu2_intc 9
152-
&cpu3_intc 0xffffffff &cpu3_intc 9
153-
&cpu4_intc 0xffffffff &cpu4_intc 9>;
148+
interrupts-extended =
149+
<&cpu0_intc 0xffffffff>,
150+
<&cpu1_intc 0xffffffff>, <&cpu1_intc 9>,
151+
<&cpu2_intc 0xffffffff>, <&cpu2_intc 9>,
152+
<&cpu3_intc 0xffffffff>, <&cpu3_intc 9>,
153+
<&cpu4_intc 0xffffffff>, <&cpu4_intc 9>;
154154
};
155155
prci: clock-controller@10000000 {
156156
compatible = "sifive,fu540-c000-prci";
@@ -170,7 +170,8 @@
170170
compatible = "sifive,fu540-c000-pdma";
171171
reg = <0x0 0x3000000 0x0 0x8000>;
172172
interrupt-parent = <&plic0>;
173-
interrupts = <23 24 25 26 27 28 29 30>;
173+
interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>,
174+
<30>;
174175
#dma-cells = <1>;
175176
};
176177
uart1: serial@10011000 {
@@ -243,7 +244,7 @@
243244
compatible = "sifive,fu540-c000-pwm", "sifive,pwm0";
244245
reg = <0x0 0x10020000 0x0 0x1000>;
245246
interrupt-parent = <&plic0>;
246-
interrupts = <42 43 44 45>;
247+
interrupts = <42>, <43>, <44>, <45>;
247248
clocks = <&prci PRCI_CLK_TLCLK>;
248249
#pwm-cells = <3>;
249250
status = "disabled";
@@ -252,7 +253,7 @@
252253
compatible = "sifive,fu540-c000-pwm", "sifive,pwm0";
253254
reg = <0x0 0x10021000 0x0 0x1000>;
254255
interrupt-parent = <&plic0>;
255-
interrupts = <46 47 48 49>;
256+
interrupts = <46>, <47>, <48>, <49>;
256257
clocks = <&prci PRCI_CLK_TLCLK>;
257258
#pwm-cells = <3>;
258259
status = "disabled";
@@ -265,7 +266,7 @@
265266
cache-size = <2097152>;
266267
cache-unified;
267268
interrupt-parent = <&plic0>;
268-
interrupts = <1 2 3>;
269+
interrupts = <1>, <2>, <3>;
269270
reg = <0x0 0x2010000 0x0 0x1000>;
270271
};
271272
gpio: gpio@10060000 {

arch/riscv/boot/dts/sifive/fu740-c000.dtsi

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@
147147
reg = <0x0 0xc000000 0x0 0x4000000>;
148148
riscv,ndev = <69>;
149149
interrupt-controller;
150-
interrupts-extended = <
151-
&cpu0_intc 0xffffffff
152-
&cpu1_intc 0xffffffff &cpu1_intc 9
153-
&cpu2_intc 0xffffffff &cpu2_intc 9
154-
&cpu3_intc 0xffffffff &cpu3_intc 9
155-
&cpu4_intc 0xffffffff &cpu4_intc 9>;
150+
interrupts-extended =
151+
<&cpu0_intc 0xffffffff>,
152+
<&cpu1_intc 0xffffffff>, <&cpu1_intc 9>,
153+
<&cpu2_intc 0xffffffff>, <&cpu2_intc 9>,
154+
<&cpu3_intc 0xffffffff>, <&cpu3_intc 9>,
155+
<&cpu4_intc 0xffffffff>, <&cpu4_intc 9>;
156156
};
157157
prci: clock-controller@10000000 {
158158
compatible = "sifive,fu740-c000-prci";
@@ -273,7 +273,7 @@
273273
cache-size = <2097152>;
274274
cache-unified;
275275
interrupt-parent = <&plic0>;
276-
interrupts = <19 21 22 20>;
276+
interrupts = <19>, <21>, <22>, <20>;
277277
reg = <0x0 0x2010000 0x0 0x1000>;
278278
};
279279
gpio: gpio@10060000 {

0 commit comments

Comments
 (0)