| Message ID | 20221221000242.340202-2-prabhakar.mahadev-lad.rj@bp.renesas.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add IRQC support to RZ/G2UL SoC | expand |
Hi Geert, Thank you for the review. On Wed, Dec 21, 2022 at 12:37 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > Hi Prabhakar, > > On Wed, Dec 21, 2022 at 1:03 AM Prabhakar <prabhakar.csengg@gmail.com> wrote: > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > Document RZ/G2UL (R9A07G043U) IRQC bindings. The IRQC block on RZ/G2UL SoC > > is almost identical to one found on the RZ/G2L SoC the only difference > > being it can support BUS_ERR_INT for which it has additional registers. > > Hence new generic compatible string "renesas,rzg2ul-irqc" is added for > > RZ/G2UL SoC. > > > > Now that we have additional interrupt for RZ/G2UL and RZ/Five SoC > > interrupt-names property is added so that we can parse them based on > > names. > > > > While at it updated the example node to four spaces and added > > interrupt-names property. > > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > --- > > v1- > v2 > > * Dropped RB tags > > * Added generic compatible string for rzg2ul > > * Added interrupt-names > > * Added checks for RZ/G2UL to make sure interrupts are 42 and interrupt-names > > * Updated example node with interrupt-names > > * Used 4 spaces for example node > > Thanks for the update! > > > --- a/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml > > +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml > > @@ -19,16 +19,19 @@ description: | > > - NMI edge select (NMI is not treated as NMI exception and supports fall edge and > > stand-up edge detection interrupts) > > > > -allOf: > > - - $ref: /schemas/interrupt-controller.yaml# > > - > > properties: > > compatible: > > - items: > > - - enum: > > - - renesas,r9a07g044-irqc # RZ/G2{L,LC} > > - - renesas,r9a07g054-irqc # RZ/V2L > > - - const: renesas,rzg2l-irqc > > + oneOf: > > + - items: > > + - enum: > > + - renesas,r9a07g044-irqc # RZ/G2{L,LC} > > + - renesas,r9a07g054-irqc # RZ/V2L > > + - const: renesas,rzg2l-irqc > > + > > + - items: > > + - enum: > > + - renesas,r9a07g043u-irqc # RZ/G2UL > > + - const: renesas,rzg2ul-irqc > > I'm not sure it's worth splitting into RZ/G2L and RZ/G2UL alike > variants, and adding the "renesas,rzg2ul-irqc" family-specific > compatible value. You can easily handle the difference by the presence > (or absence) of the "bus-err" interrupt source. > Yes, the only reason to add "renesas,rzg2ul-irqc" is to differentiate RZ/Five later. I have not worked out on how this driver will work in case of RZ/Five yet with PLIC (as we sifive plic driver as a chained handler and then we have the RISC-V intc driver). If you insist I can drop it for now and then later when we add RZ/FIve we could add a check for compat string maybe? > I understand there "renesas,r9a07g043f-irqc" will be added later to > support RZ/Five? > Yes. Cheers, Prabhakar
Hi Prabhakar, On Wed, Dec 21, 2022 at 10:06 PM Lad, Prabhakar <prabhakar.csengg@gmail.com> wrote: > On Wed, Dec 21, 2022 at 12:37 PM Geert Uytterhoeven > <geert@linux-m68k.org> wrote: > > On Wed, Dec 21, 2022 at 1:03 AM Prabhakar <prabhakar.csengg@gmail.com> wrote: > > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > > > Document RZ/G2UL (R9A07G043U) IRQC bindings. The IRQC block on RZ/G2UL SoC > > > is almost identical to one found on the RZ/G2L SoC the only difference > > > being it can support BUS_ERR_INT for which it has additional registers. > > > Hence new generic compatible string "renesas,rzg2ul-irqc" is added for > > > RZ/G2UL SoC. > > > > > > Now that we have additional interrupt for RZ/G2UL and RZ/Five SoC > > > interrupt-names property is added so that we can parse them based on > > > names. > > > > > > While at it updated the example node to four spaces and added > > > interrupt-names property. > > > > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > --- > > > v1- > v2 > > > * Dropped RB tags > > > * Added generic compatible string for rzg2ul > > > * Added interrupt-names > > > * Added checks for RZ/G2UL to make sure interrupts are 42 and interrupt-names > > > * Updated example node with interrupt-names > > > * Used 4 spaces for example node > > > > Thanks for the update! > > > > > --- a/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml > > > +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml > > > @@ -19,16 +19,19 @@ description: | > > > - NMI edge select (NMI is not treated as NMI exception and supports fall edge and > > > stand-up edge detection interrupts) > > > > > > -allOf: > > > - - $ref: /schemas/interrupt-controller.yaml# > > > - > > > properties: > > > compatible: > > > - items: > > > - - enum: > > > - - renesas,r9a07g044-irqc # RZ/G2{L,LC} > > > - - renesas,r9a07g054-irqc # RZ/V2L > > > - - const: renesas,rzg2l-irqc > > > + oneOf: > > > + - items: > > > + - enum: > > > + - renesas,r9a07g044-irqc # RZ/G2{L,LC} > > > + - renesas,r9a07g054-irqc # RZ/V2L > > > + - const: renesas,rzg2l-irqc > > > + > > > + - items: > > > + - enum: > > > + - renesas,r9a07g043u-irqc # RZ/G2UL > > > + - const: renesas,rzg2ul-irqc > > > > I'm not sure it's worth splitting into RZ/G2L and RZ/G2UL alike > > variants, and adding the "renesas,rzg2ul-irqc" family-specific > > compatible value. You can easily handle the difference by the presence > > (or absence) of the "bus-err" interrupt source. > > > Yes, the only reason to add "renesas,rzg2ul-irqc" is to differentiate > RZ/Five later. I have not worked out on how this driver will work in > case of RZ/Five yet with PLIC (as we sifive plic driver as a chained > handler and then we have the RISC-V intc driver). If you insist I can > drop it for now and then later when we add RZ/FIve we could add a > check for compat string maybe? Given you already use "renesas,r9a07g043u-irqc" (note the "u") here, you will have "renesas,r9a07g043f-irqc" to handle the (minor) differences. > > I understand there "renesas,r9a07g043f-irqc" will be added later to > > support RZ/Five? > > > Yes. 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
Hi Geert, On Thu, Dec 22, 2022 at 8:19 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > Hi Prabhakar, > > On Wed, Dec 21, 2022 at 10:06 PM Lad, Prabhakar > <prabhakar.csengg@gmail.com> wrote: > > On Wed, Dec 21, 2022 at 12:37 PM Geert Uytterhoeven > > <geert@linux-m68k.org> wrote: > > > On Wed, Dec 21, 2022 at 1:03 AM Prabhakar <prabhakar.csengg@gmail.com> wrote: > > > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > > > > > Document RZ/G2UL (R9A07G043U) IRQC bindings. The IRQC block on RZ/G2UL SoC > > > > is almost identical to one found on the RZ/G2L SoC the only difference > > > > being it can support BUS_ERR_INT for which it has additional registers. > > > > Hence new generic compatible string "renesas,rzg2ul-irqc" is added for > > > > RZ/G2UL SoC. > > > > > > > > Now that we have additional interrupt for RZ/G2UL and RZ/Five SoC > > > > interrupt-names property is added so that we can parse them based on > > > > names. > > > > > > > > While at it updated the example node to four spaces and added > > > > interrupt-names property. > > > > > > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > --- > > > > v1- > v2 > > > > * Dropped RB tags > > > > * Added generic compatible string for rzg2ul > > > > * Added interrupt-names > > > > * Added checks for RZ/G2UL to make sure interrupts are 42 and interrupt-names > > > > * Updated example node with interrupt-names > > > > * Used 4 spaces for example node > > > > > > Thanks for the update! > > > > > > > --- a/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml > > > > +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml > > > > @@ -19,16 +19,19 @@ description: | > > > > - NMI edge select (NMI is not treated as NMI exception and supports fall edge and > > > > stand-up edge detection interrupts) > > > > > > > > -allOf: > > > > - - $ref: /schemas/interrupt-controller.yaml# > > > > - > > > > properties: > > > > compatible: > > > > - items: > > > > - - enum: > > > > - - renesas,r9a07g044-irqc # RZ/G2{L,LC} > > > > - - renesas,r9a07g054-irqc # RZ/V2L > > > > - - const: renesas,rzg2l-irqc > > > > + oneOf: > > > > + - items: > > > > + - enum: > > > > + - renesas,r9a07g044-irqc # RZ/G2{L,LC} > > > > + - renesas,r9a07g054-irqc # RZ/V2L > > > > + - const: renesas,rzg2l-irqc > > > > + > > > > + - items: > > > > + - enum: > > > > + - renesas,r9a07g043u-irqc # RZ/G2UL > > > > + - const: renesas,rzg2ul-irqc > > > > > > I'm not sure it's worth splitting into RZ/G2L and RZ/G2UL alike > > > variants, and adding the "renesas,rzg2ul-irqc" family-specific > > > compatible value. You can easily handle the difference by the presence > > > (or absence) of the "bus-err" interrupt source. > > > > > Yes, the only reason to add "renesas,rzg2ul-irqc" is to differentiate > > RZ/Five later. I have not worked out on how this driver will work in > > case of RZ/Five yet with PLIC (as we sifive plic driver as a chained > > handler and then we have the RISC-V intc driver). If you insist I can > > drop it for now and then later when we add RZ/FIve we could add a > > check for compat string maybe? > > Given you already use "renesas,r9a07g043u-irqc" (note the "u") here, > you will have "renesas,r9a07g043f-irqc" to handle the (minor) > differences. > Ok, so I'll revert back to the previous version of the patch and still add the interrupt names. Cheers, Prabhakar
diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml b/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml index 33b90e975e33..6a0cf57698ab 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml @@ -19,16 +19,19 @@ description: | - NMI edge select (NMI is not treated as NMI exception and supports fall edge and stand-up edge detection interrupts) -allOf: - - $ref: /schemas/interrupt-controller.yaml# - properties: compatible: - items: - - enum: - - renesas,r9a07g044-irqc # RZ/G2{L,LC} - - renesas,r9a07g054-irqc # RZ/V2L - - const: renesas,rzg2l-irqc + oneOf: + - items: + - enum: + - renesas,r9a07g044-irqc # RZ/G2{L,LC} + - renesas,r9a07g054-irqc # RZ/V2L + - const: renesas,rzg2l-irqc + + - items: + - enum: + - renesas,r9a07g043u-irqc # RZ/G2UL + - const: renesas,rzg2ul-irqc '#interrupt-cells': description: The first cell should contain external interrupt number (IRQ0-7) and the @@ -44,7 +47,96 @@ properties: maxItems: 1 interrupts: - maxItems: 41 + minItems: 41 + items: + - description: NMI interrupt + - description: IRQ0 interrupt + - description: IRQ1 interrupt + - description: IRQ2 interrupt + - description: IRQ3 interrupt + - description: IRQ4 interrupt + - description: IRQ5 interrupt + - description: IRQ6 interrupt + - description: IRQ7 interrupt + - description: GPIO interrupt, TINT0 + - description: GPIO interrupt, TINT1 + - description: GPIO interrupt, TINT2 + - description: GPIO interrupt, TINT3 + - description: GPIO interrupt, TINT4 + - description: GPIO interrupt, TINT5 + - description: GPIO interrupt, TINT6 + - description: GPIO interrupt, TINT7 + - description: GPIO interrupt, TINT8 + - description: GPIO interrupt, TINT9 + - description: GPIO interrupt, TINT10 + - description: GPIO interrupt, TINT11 + - description: GPIO interrupt, TINT12 + - description: GPIO interrupt, TINT13 + - description: GPIO interrupt, TINT14 + - description: GPIO interrupt, TINT15 + - description: GPIO interrupt, TINT16 + - description: GPIO interrupt, TINT17 + - description: GPIO interrupt, TINT18 + - description: GPIO interrupt, TINT19 + - description: GPIO interrupt, TINT20 + - description: GPIO interrupt, TINT21 + - description: GPIO interrupt, TINT22 + - description: GPIO interrupt, TINT23 + - description: GPIO interrupt, TINT24 + - description: GPIO interrupt, TINT25 + - description: GPIO interrupt, TINT26 + - description: GPIO interrupt, TINT27 + - description: GPIO interrupt, TINT28 + - description: GPIO interrupt, TINT29 + - description: GPIO interrupt, TINT30 + - description: GPIO interrupt, TINT31 + - description: Bus error interrupt + + interrupt-names: + minItems: 41 + items: + - const: nmi + - const: irq0 + - const: irq1 + - const: irq2 + - const: irq3 + - const: irq4 + - const: irq5 + - const: irq6 + - const: irq7 + - const: tint0 + - const: tint1 + - const: tint2 + - const: tint3 + - const: tint4 + - const: tint5 + - const: tint6 + - const: tint7 + - const: tint8 + - const: tint9 + - const: tint10 + - const: tint11 + - const: tint12 + - const: tint13 + - const: tint14 + - const: tint15 + - const: tint16 + - const: tint17 + - const: tint18 + - const: tint19 + - const: tint20 + - const: tint21 + - const: tint22 + - const: tint23 + - const: tint24 + - const: tint25 + - const: tint26 + - const: tint27 + - const: tint28 + - const: tint29 + - const: tint30 + - const: tint31 + - const: bus-err clocks: maxItems: 2 @@ -72,6 +164,23 @@ required: - power-domains - resets +allOf: + - $ref: /schemas/interrupt-controller.yaml# + + - if: + properties: + compatible: + contains: + const: renesas,rzg2ul-irqc + then: + properties: + interrupts: + minItems: 42 + interrupt-names: + minItems: 42 + required: + - interrupt-names + unevaluatedProperties: false examples: @@ -80,55 +189,66 @@ examples: #include <dt-bindings/clock/r9a07g044-cpg.h> irqc: interrupt-controller@110a0000 { - compatible = "renesas,r9a07g044-irqc", "renesas,rzg2l-irqc"; - reg = <0x110a0000 0x10000>; - #interrupt-cells = <2>; - #address-cells = <0>; - interrupt-controller; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 445 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 447 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 448 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 449 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 450 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 451 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 452 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 453 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 454 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 455 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 456 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 457 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 458 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 459 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 460 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 461 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 463 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 471 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 475 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cpg CPG_MOD R9A07G044_IA55_CLK>, - <&cpg CPG_MOD R9A07G044_IA55_PCLK>; - clock-names = "clk", "pclk"; - power-domains = <&cpg>; - resets = <&cpg R9A07G044_IA55_RESETN>; + compatible = "renesas,r9a07g044-irqc", "renesas,rzg2l-irqc"; + reg = <0x110a0000 0x10000>; + #interrupt-cells = <2>; + #address-cells = <0>; + interrupt-controller; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 445 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 447 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 448 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 449 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 450 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 451 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 452 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 453 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 454 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 455 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 456 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 457 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 458 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 459 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 460 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 461 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 463 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 471 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 475 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "nmi", + "irq0", "irq1", "irq2", "irq3", + "irq4", "irq5", "irq6", "irq7", + "tint0", "tint1", "tint2", "tint3", + "tint4", "tint5", "tint6", "tint7", + "tint8", "tint9", "tint10", "tint11", + "tint12", "tint13", "tint14", "tint15", + "tint16", "tint17", "tint18", "tint19", + "tint20", "tint21", "tint22", "tint23", + "tint24", "tint25", "tint26", "tint27", + "tint28", "tint29", "tint30", "tint31"; + clocks = <&cpg CPG_MOD R9A07G044_IA55_CLK>, + <&cpg CPG_MOD R9A07G044_IA55_PCLK>; + clock-names = "clk", "pclk"; + power-domains = <&cpg>; + resets = <&cpg R9A07G044_IA55_RESETN>; };