| Message ID | 20211125153131.163533-5-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | riscv: dts: Miscellaneous fixes | expand |
On 25/11/2021 15:31, Geert Uytterhoeven wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > 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. Hi Geert, I notice most of the icicle kit patches in this series were feedback items from you on my series. I am assuming your intent is that I drop those from my V2 (which should've been here by now but other things got in the way) and base on this? Thanks, Conor. > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> > --- > .../boot/dts/microchip/microchip-mpfs.dtsi | 31 ++++++++++--------- > 1 file changed, 16 insertions(+), 15 deletions(-) > > diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi > index 794da883acb19256..d91226bfa586cda7 100644 > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi > @@ -153,18 +153,18 @@ cache-controller@2010000 { > cache-size = <2097152>; > cache-unified; > interrupt-parent = <&plic>; > - interrupts = <1 2 3>; > + interrupts = <1>, <2>, <3>; > reg = <0x0 0x2010000 0x0 0x1000>; > }; > > clint@2000000 { > compatible = "sifive,fu540-c000-clint", "sifive,clint0"; > reg = <0x0 0x2000000 0x0 0xC000>; > - interrupts-extended = <&cpu0_intc 3 &cpu0_intc 7 > - &cpu1_intc 3 &cpu1_intc 7 > - &cpu2_intc 3 &cpu2_intc 7 > - &cpu3_intc 3 &cpu3_intc 7 > - &cpu4_intc 3 &cpu4_intc 7>; > + interrupts-extended = <&cpu0_intc 3>, <&cpu0_intc 7>, > + <&cpu1_intc 3>, <&cpu1_intc 7>, > + <&cpu2_intc 3>, <&cpu2_intc 7>, > + <&cpu3_intc 3>, <&cpu3_intc 7>, > + <&cpu4_intc 3>, <&cpu4_intc 7>; > }; > > plic: interrupt-controller@c000000 { > @@ -173,18 +173,19 @@ plic: interrupt-controller@c000000 { > reg = <0x0 0xc000000 0x0 0x4000000>; > riscv,ndev = <186>; > interrupt-controller; > - interrupts-extended = <&cpu0_intc 11 > - &cpu1_intc 11 &cpu1_intc 9 > - &cpu2_intc 11 &cpu2_intc 9 > - &cpu3_intc 11 &cpu3_intc 9 > - &cpu4_intc 11 &cpu4_intc 9>; > + interrupts-extended = <&cpu0_intc 11>, > + <&cpu1_intc 11>, <&cpu1_intc 9>, > + <&cpu2_intc 11>, <&cpu2_intc 9>, > + <&cpu3_intc 11>, <&cpu3_intc 9>, > + <&cpu4_intc 11>, <&cpu4_intc 9>; > }; > > dma@3000000 { > compatible = "sifive,fu540-c000-pdma"; > reg = <0x0 0x3000000 0x0 0x8000>; > interrupt-parent = <&plic>; > - interrupts = <23 24 25 26 27 28 29 30>; > + interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>, > + <30>; > #dma-cells = <1>; > }; > > @@ -264,7 +265,7 @@ mmc: mmc@20008000 { > compatible = "microchip,mpfs-sd4hc", "cdns,sd4hc"; > reg = <0x0 0x20008000 0x0 0x1000>; > interrupt-parent = <&plic>; > - interrupts = <88 89>; > + interrupts = <88>, <89>; > clocks = <&clkcfg 6>; > max-frequency = <200000000>; > status = "disabled"; > @@ -274,7 +275,7 @@ emac0: ethernet@20110000 { > compatible = "cdns,macb"; > reg = <0x0 0x20110000 0x0 0x2000>; > interrupt-parent = <&plic>; > - interrupts = <64 65 66 67>; > + interrupts = <64>, <65>, <66>, <67>; > local-mac-address = [00 00 00 00 00 00]; > clocks = <&clkcfg 4>, <&clkcfg 2>; > clock-names = "pclk", "hclk"; > @@ -287,7 +288,7 @@ emac1: ethernet@20112000 { > compatible = "cdns,macb"; > reg = <0x0 0x20112000 0x0 0x2000>; > interrupt-parent = <&plic>; > - interrupts = <70 71 72 73>; > + interrupts = <70>, <71>, <72>, <73>; > local-mac-address = [00 00 00 00 00 00]; > clocks = <&clkcfg 5>, <&clkcfg 2>; > status = "disabled"; > -- > 2.25.1 >
On 25/11/2021 16:31, Geert Uytterhoeven wrote: > 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> > --- > .../boot/dts/microchip/microchip-mpfs.dtsi | 31 ++++++++++--------- > 1 file changed, 16 insertions(+), 15 deletions(-) > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Best regards, Krzysztof
Hi Conor, On Fri, Nov 26, 2021 at 9:42 AM <Conor.Dooley@microchip.com> wrote: > On 25/11/2021 15:31, Geert Uytterhoeven wrote: > > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > 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. > I notice most of the icicle kit patches in this series were feedback > items from you on my series. I am assuming your intent is that I drop Yeah, when I commented on your series, I already had made most of these changes to my tree, but they were in an unfinished state. > those from my V2 (which should've been here by now but other things got > in the way) and base on this? That may indeed be the easiest solution: fix existing issues first, then enable more features. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On 03/12/2021 14:38, Geert Uytterhoeven wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > Hi Conor, > > On Fri, Nov 26, 2021 at 9:42 AM <Conor.Dooley@microchip.com> wrote: >> On 25/11/2021 15:31, Geert Uytterhoeven wrote: >>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe >>> 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. > >> I notice most of the icicle kit patches in this series were feedback >> items from you on my series. I am assuming your intent is that I drop > > Yeah, when I commented on your series, I already had made most of > these changes to my tree, but they were in an unfinished state. > >> those from my V2 (which should've been here by now but other things got >> in the way) and base on this? > > That may indeed be the easiest solution: fix existing issues first, then > enable more features. Aye, sounds good to me. And since I did build/boot etc with this series: Reviewed-by: Conor Dooley <conor.dooley@microchip.com> > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds >
diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi index 794da883acb19256..d91226bfa586cda7 100644 --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi @@ -153,18 +153,18 @@ cache-controller@2010000 { cache-size = <2097152>; cache-unified; interrupt-parent = <&plic>; - interrupts = <1 2 3>; + interrupts = <1>, <2>, <3>; reg = <0x0 0x2010000 0x0 0x1000>; }; clint@2000000 { compatible = "sifive,fu540-c000-clint", "sifive,clint0"; reg = <0x0 0x2000000 0x0 0xC000>; - interrupts-extended = <&cpu0_intc 3 &cpu0_intc 7 - &cpu1_intc 3 &cpu1_intc 7 - &cpu2_intc 3 &cpu2_intc 7 - &cpu3_intc 3 &cpu3_intc 7 - &cpu4_intc 3 &cpu4_intc 7>; + interrupts-extended = <&cpu0_intc 3>, <&cpu0_intc 7>, + <&cpu1_intc 3>, <&cpu1_intc 7>, + <&cpu2_intc 3>, <&cpu2_intc 7>, + <&cpu3_intc 3>, <&cpu3_intc 7>, + <&cpu4_intc 3>, <&cpu4_intc 7>; }; plic: interrupt-controller@c000000 { @@ -173,18 +173,19 @@ plic: interrupt-controller@c000000 { reg = <0x0 0xc000000 0x0 0x4000000>; riscv,ndev = <186>; interrupt-controller; - interrupts-extended = <&cpu0_intc 11 - &cpu1_intc 11 &cpu1_intc 9 - &cpu2_intc 11 &cpu2_intc 9 - &cpu3_intc 11 &cpu3_intc 9 - &cpu4_intc 11 &cpu4_intc 9>; + interrupts-extended = <&cpu0_intc 11>, + <&cpu1_intc 11>, <&cpu1_intc 9>, + <&cpu2_intc 11>, <&cpu2_intc 9>, + <&cpu3_intc 11>, <&cpu3_intc 9>, + <&cpu4_intc 11>, <&cpu4_intc 9>; }; dma@3000000 { compatible = "sifive,fu540-c000-pdma"; reg = <0x0 0x3000000 0x0 0x8000>; interrupt-parent = <&plic>; - interrupts = <23 24 25 26 27 28 29 30>; + interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>, + <30>; #dma-cells = <1>; }; @@ -264,7 +265,7 @@ mmc: mmc@20008000 { compatible = "microchip,mpfs-sd4hc", "cdns,sd4hc"; reg = <0x0 0x20008000 0x0 0x1000>; interrupt-parent = <&plic>; - interrupts = <88 89>; + interrupts = <88>, <89>; clocks = <&clkcfg 6>; max-frequency = <200000000>; status = "disabled"; @@ -274,7 +275,7 @@ emac0: ethernet@20110000 { compatible = "cdns,macb"; reg = <0x0 0x20110000 0x0 0x2000>; interrupt-parent = <&plic>; - interrupts = <64 65 66 67>; + interrupts = <64>, <65>, <66>, <67>; local-mac-address = [00 00 00 00 00 00]; clocks = <&clkcfg 4>, <&clkcfg 2>; clock-names = "pclk", "hclk"; @@ -287,7 +288,7 @@ emac1: ethernet@20112000 { compatible = "cdns,macb"; reg = <0x0 0x20112000 0x0 0x2000>; interrupt-parent = <&plic>; - interrupts = <70 71 72 73>; + interrupts = <70>, <71>, <72>, <73>; local-mac-address = [00 00 00 00 00 00]; clocks = <&clkcfg 5>, <&clkcfg 2>; status = "disabled";
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> --- .../boot/dts/microchip/microchip-mpfs.dtsi | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-)