Skip to content

Commit 91a5334

Browse files
geertuConchuOD
authored andcommitted
riscv: dts: microchip: mpfs: 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 <geert@linux-m68k.org> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Tested-by: Conor Dooley <conor.dooley@microchip.com> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> (Conor: Fixed conflict on cherry-pick) Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
1 parent b7e57b9 commit 91a5334

1 file changed

Lines changed: 17 additions & 16 deletions

File tree

arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -158,38 +158,39 @@
158158
cache-size = <2097152>;
159159
cache-unified;
160160
interrupt-parent = <&plic>;
161-
interrupts = <1 2 3>;
161+
interrupts = <1>, <2>, <3>;
162162
reg = <0x0 0x2010000 0x0 0x1000>;
163163
};
164164

165165
clint@2000000 {
166166
compatible = "sifive,fu540-c000-clint", "sifive,clint0";
167167
reg = <0x0 0x2000000 0x0 0xC000>;
168-
interrupts-extended = <&cpu0_intc 3 &cpu0_intc 7
169-
&cpu1_intc 3 &cpu1_intc 7
170-
&cpu2_intc 3 &cpu2_intc 7
171-
&cpu3_intc 3 &cpu3_intc 7
172-
&cpu4_intc 3 &cpu4_intc 7>;
168+
interrupts-extended = <&cpu0_intc 3>, <&cpu0_intc 7>,
169+
<&cpu1_intc 3>, <&cpu1_intc 7>,
170+
<&cpu2_intc 3>, <&cpu2_intc 7>,
171+
<&cpu3_intc 3>, <&cpu3_intc 7>,
172+
<&cpu4_intc 3>, <&cpu4_intc 7>;
173173
};
174174

175175
plic: interrupt-controller@c000000 {
176176
#interrupt-cells = <1>;
177177
compatible = "sifive,fu540-c000-plic", "sifive,plic-1.0.0";
178178
reg = <0x0 0xc000000 0x0 0x4000000>;
179-
riscv,ndev = <186>;
180179
interrupt-controller;
181-
interrupts-extended = <&cpu0_intc 11
182-
&cpu1_intc 11 &cpu1_intc 9
183-
&cpu2_intc 11 &cpu2_intc 9
184-
&cpu3_intc 11 &cpu3_intc 9
185-
&cpu4_intc 11 &cpu4_intc 9>;
180+
interrupts-extended = <&cpu0_intc 11>,
181+
<&cpu1_intc 11>, <&cpu1_intc 9>,
182+
<&cpu2_intc 11>, <&cpu2_intc 9>,
183+
<&cpu3_intc 11>, <&cpu3_intc 9>,
184+
<&cpu4_intc 11>, <&cpu4_intc 9>;
185+
riscv,ndev = <186>;
186186
};
187187

188188
dma@3000000 {
189189
compatible = "sifive,fu540-c000-pdma";
190190
reg = <0x0 0x3000000 0x0 0x8000>;
191191
interrupt-parent = <&plic>;
192-
interrupts = <23 24 25 26 27 28 29 30>;
192+
interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>,
193+
<30>;
193194
#dma-cells = <1>;
194195
};
195196

@@ -253,7 +254,7 @@
253254
compatible = "microchip,mpfs-sd4hc", "cdns,sd4hc";
254255
reg = <0x0 0x20008000 0x0 0x1000>;
255256
interrupt-parent = <&plic>;
256-
interrupts = <88 89>;
257+
interrupts = <88>, <89>;
257258
clocks = <&clkcfg 6>;
258259
max-frequency = <200000000>;
259260
status = "disabled";
@@ -263,7 +264,7 @@
263264
compatible = "cdns,macb";
264265
reg = <0x0 0x20110000 0x0 0x2000>;
265266
interrupt-parent = <&plic>;
266-
interrupts = <64 65 66 67>;
267+
interrupts = <64>, <65>, <66>, <67>;
267268
local-mac-address = [00 00 00 00 00 00];
268269
clocks = <&clkcfg 4>, <&clkcfg 2>;
269270
clock-names = "pclk", "hclk";
@@ -276,7 +277,7 @@
276277
compatible = "cdns,macb";
277278
reg = <0x0 0x20112000 0x0 0x2000>;
278279
interrupt-parent = <&plic>;
279-
interrupts = <70 71 72 73>;
280+
interrupts = <70>, <71>, <72>, <73>;
280281
local-mac-address = [00 00 00 00 00 00];
281282
clocks = <&clkcfg 5>, <&clkcfg 2>;
282283
status = "disabled";

0 commit comments

Comments
 (0)