Unverified Commit cc79be0e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Palmer Dabbelt
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent e35b07a7

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

+11 −10
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ 
			reg = <0x0 0xc000000 0x0 0x4000000>;

			riscv,ndev = <53>;

			interrupt-controller;

			interrupts-extended = <

				&cpu0_intc 0xffffffff

				&cpu1_intc 0xffffffff &cpu1_intc 9

				&cpu2_intc 0xffffffff &cpu2_intc 9

				&cpu3_intc 0xffffffff &cpu3_intc 9

				&cpu4_intc 0xffffffff &cpu4_intc 9>;

			interrupts-extended =

				<&cpu0_intc 0xffffffff>,

				<&cpu1_intc 0xffffffff>, <&cpu1_intc 9>,

				<&cpu2_intc 0xffffffff>, <&cpu2_intc 9>,

				<&cpu3_intc 0xffffffff>, <&cpu3_intc 9>,

				<&cpu4_intc 0xffffffff>, <&cpu4_intc 9>;

		};

		prci: clock-controller@10000000 {

			compatible = "sifive,fu540-c000-prci";
@@ -170,7 +170,8 @@ 
			compatible = "sifive,fu540-c000-pdma";

			reg = <0x0 0x3000000 0x0 0x8000>;

			interrupt-parent = <&plic0>;

			interrupts = <23 24 25 26 27 28 29 30>;

			interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>,

				     <30>;

			#dma-cells = <1>;

		};

		uart1: serial@10011000 {
@@ -243,7 +244,7 @@ 
			compatible = "sifive,fu540-c000-pwm", "sifive,pwm0";

			reg = <0x0 0x10020000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <42 43 44 45>;

			interrupts = <42>, <43>, <44>, <45>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			#pwm-cells = <3>;

			status = "disabled";
@@ -252,7 +253,7 @@ 
			compatible = "sifive,fu540-c000-pwm", "sifive,pwm0";

			reg = <0x0 0x10021000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <46 47 48 49>;

			interrupts = <46>, <47>, <48>, <49>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			#pwm-cells = <3>;

			status = "disabled";
@@ -265,7 +266,7 @@ 
			cache-size = <2097152>;

			cache-unified;

			interrupt-parent = <&plic0>;

			interrupts = <1 2 3>;

			interrupts = <1>, <2>, <3>;

			reg = <0x0 0x2010000 0x0 0x1000>;

		};

		gpio: gpio@10060000 {

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

+7 −7
Original line number Diff line number Diff line
@@ -147,12 +147,12 @@ 
			reg = <0x0 0xc000000 0x0 0x4000000>;

			riscv,ndev = <69>;

			interrupt-controller;

			interrupts-extended = <

				&cpu0_intc 0xffffffff

				&cpu1_intc 0xffffffff &cpu1_intc 9

				&cpu2_intc 0xffffffff &cpu2_intc 9

				&cpu3_intc 0xffffffff &cpu3_intc 9

				&cpu4_intc 0xffffffff &cpu4_intc 9>;

			interrupts-extended =

				<&cpu0_intc 0xffffffff>,

				<&cpu1_intc 0xffffffff>, <&cpu1_intc 9>,

				<&cpu2_intc 0xffffffff>, <&cpu2_intc 9>,

				<&cpu3_intc 0xffffffff>, <&cpu3_intc 9>,

				<&cpu4_intc 0xffffffff>, <&cpu4_intc 9>;

		};

		prci: clock-controller@10000000 {

			compatible = "sifive,fu740-c000-prci";
@@ -273,7 +273,7 @@ 
			cache-size = <2097152>;

			cache-unified;

			interrupt-parent = <&plic0>;

			interrupts = <19 21 22 20>;

			interrupts = <19>, <21>, <22>, <20>;

			reg = <0x0 0x2010000 0x0 0x1000>;

		};

		gpio: gpio@10060000 {