| Message ID | 20250210114540.524790-3-tommaso.merciai.xr@bp.renesas.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | media: rzg2l-cru: Document RZ/G3E (CSI2, CRU) | expand |
Hi Tommaso, Prabhakar, Thank you for the patch. On Mon, Feb 10, 2025 at 12:45:34PM +0100, Tommaso Merciai wrote: > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > The MIPI CSI-2 block on the Renesas RZ/V2H(P) SoC is similar to the one > found on the Renesas RZ/G2L SoC, with the following differences: > - A different D-PHY > - Additional registers for the MIPI CSI-2 link > - Only two clocks > > Add a new compatible string, `renesas,r9a09g057-csi2`, for the RZ/V2H(P) > SoC. > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com> > --- > .../bindings/media/renesas,rzg2l-csi2.yaml | 63 ++++++++++++++----- > 1 file changed, 48 insertions(+), 15 deletions(-) > > diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > index 7faa12fecd5b..0d07c55a3f35 100644 > --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > @@ -17,12 +17,15 @@ description: > > properties: > compatible: > - items: > - - enum: > - - renesas,r9a07g043-csi2 # RZ/G2UL > - - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > - - renesas,r9a07g054-csi2 # RZ/V2L > - - const: renesas,rzg2l-csi2 > + oneOf: > + - items: > + - enum: > + - renesas,r9a07g043-csi2 # RZ/G2UL > + - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > + - renesas,r9a07g054-csi2 # RZ/V2L > + - const: renesas,rzg2l-csi2 > + I'd drop the empty line. > + - const: renesas,r9a09g057-csi2 # RZ/V2H(P) > > reg: > maxItems: 1 > @@ -31,16 +34,24 @@ properties: > maxItems: 1 > > clocks: > - items: > - - description: Internal clock for connecting CRU and MIPI > - - description: CRU Main clock > - - description: CRU Register access clock > + oneOf: > + - items: > + - description: Internal clock for connecting CRU and MIPI > + - description: CRU Main clock > + - description: CRU Register access clock > + - items: > + - description: CRU Main clock > + - description: CRU Register access clock > > clock-names: > - items: > - - const: system > - - const: video > - - const: apb > + oneOf: > + - items: > + - const: system > + - const: video > + - const: apb > + - items: > + - const: video > + - const: apb I would move the clocks and clock-names definitions to the conditional below. Otherwise I think a device tree that has two clocks only but incorrectly uses "system" and "video" instead of "video" and "apb" will validate. > > power-domains: > maxItems: 1 > @@ -48,7 +59,7 @@ properties: > resets: > items: > - description: CRU_PRESETN reset terminal > - - description: CRU_CMN_RSTB reset terminal > + - description: CRU_CMN_RSTB reset terminal or D-PHY reset > > reset-names: > items: > @@ -101,6 +112,28 @@ required: > - reset-names > - ports > > +allOf: > + - if: > + properties: > + compatible: > + contains: > + const: renesas,r9a09g057-csi2 > + then: > + properties: > + clocks: > + maxItems: 2 > + > + clock-names: > + maxItems: 2 > + > + else: > + properties: > + clocks: > + maxItems: 3 > + > + clock-names: > + maxItems: 3 > + > additionalProperties: false > > examples:
Hi Laurent, Thanks for your review. On Fri, Feb 14, 2025 at 02:29:51AM +0200, Laurent Pinchart wrote: > Hi Tommaso, Prabhakar, > > Thank you for the patch. > > On Mon, Feb 10, 2025 at 12:45:34PM +0100, Tommaso Merciai wrote: > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > The MIPI CSI-2 block on the Renesas RZ/V2H(P) SoC is similar to the one > > found on the Renesas RZ/G2L SoC, with the following differences: > > - A different D-PHY > > - Additional registers for the MIPI CSI-2 link > > - Only two clocks > > > > Add a new compatible string, `renesas,r9a09g057-csi2`, for the RZ/V2H(P) > > SoC. > > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com> > > --- > > .../bindings/media/renesas,rzg2l-csi2.yaml | 63 ++++++++++++++----- > > 1 file changed, 48 insertions(+), 15 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > index 7faa12fecd5b..0d07c55a3f35 100644 > > --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > @@ -17,12 +17,15 @@ description: > > > > properties: > > compatible: > > - items: > > - - enum: > > - - renesas,r9a07g043-csi2 # RZ/G2UL > > - - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > - - renesas,r9a07g054-csi2 # RZ/V2L > > - - const: renesas,rzg2l-csi2 > > + oneOf: > > + - items: > > + - enum: > > + - renesas,r9a07g043-csi2 # RZ/G2UL > > + - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > + - renesas,r9a07g054-csi2 # RZ/V2L > > + - const: renesas,rzg2l-csi2 > > + > > I'd drop the empty line. I'll drop this line in v2, thanks. > > > + - const: renesas,r9a09g057-csi2 # RZ/V2H(P) > > > > reg: > > maxItems: 1 > > @@ -31,16 +34,24 @@ properties: > > maxItems: 1 > > > > clocks: > > - items: > > - - description: Internal clock for connecting CRU and MIPI > > - - description: CRU Main clock > > - - description: CRU Register access clock > > + oneOf: > > + - items: > > + - description: Internal clock for connecting CRU and MIPI > > + - description: CRU Main clock > > + - description: CRU Register access clock > > + - items: > > + - description: CRU Main clock > > + - description: CRU Register access clock > > > > clock-names: > > - items: > > - - const: system > > - - const: video > > - - const: apb > > + oneOf: > > + - items: > > + - const: system > > + - const: video > > + - const: apb > > + - items: > > + - const: video > > + - const: apb > > I would move the clocks and clock-names definitions to the conditional > below. Otherwise I think a device tree that has two clocks only but > incorrectly uses "system" and "video" instead of "video" and "apb" will > validate. Agreed. Taking as reference your work done on renesas,fcp.yaml. What about the following? clocks: true clock-names: true Then move the clocks and clock-names below as you suggested into the conditional block: allOf: - if: properties: compatible: contains: const: renesas,r9a09g057-csi2 then: properties: clocks: items: - description: CRU Main clock - description: CRU Register access clock clock-names: items: - const: video - const: apb else: properties: clocks: items: - description: Internal clock for connecting CRU and MIPI - description: CRU Main clock - description: CRU Register access clock clock-names: items: - const: system - const: video - const: apb Thanks in advance. > > > > > power-domains: > > maxItems: 1 > > @@ -48,7 +59,7 @@ properties: > > resets: > > items: > > - description: CRU_PRESETN reset terminal > > - - description: CRU_CMN_RSTB reset terminal > > + - description: CRU_CMN_RSTB reset terminal or D-PHY reset > > > > reset-names: > > items: > > @@ -101,6 +112,28 @@ required: > > - reset-names > > - ports > > > > +allOf: > > + - if: > > + properties: > > + compatible: > > + contains: > > + const: renesas,r9a09g057-csi2 > > + then: > > + properties: > > + clocks: > > + maxItems: 2 > > + > > + clock-names: > > + maxItems: 2 > > + > > + else: > > + properties: > > + clocks: > > + maxItems: 3 > > + > > + clock-names: > > + maxItems: 3 > > + > > additionalProperties: false > > > > examples: > > -- > Regards, > > Laurent Pinchart Thanks & Regards, Tommaso
On Tue, Feb 18, 2025 at 12:55:22PM +0100, Tommaso Merciai wrote: > On Fri, Feb 14, 2025 at 02:29:51AM +0200, Laurent Pinchart wrote: > > On Mon, Feb 10, 2025 at 12:45:34PM +0100, Tommaso Merciai wrote: > > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > > > The MIPI CSI-2 block on the Renesas RZ/V2H(P) SoC is similar to the one > > > found on the Renesas RZ/G2L SoC, with the following differences: > > > - A different D-PHY > > > - Additional registers for the MIPI CSI-2 link > > > - Only two clocks > > > > > > Add a new compatible string, `renesas,r9a09g057-csi2`, for the RZ/V2H(P) > > > SoC. > > > > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com> > > > --- > > > .../bindings/media/renesas,rzg2l-csi2.yaml | 63 ++++++++++++++----- > > > 1 file changed, 48 insertions(+), 15 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > > index 7faa12fecd5b..0d07c55a3f35 100644 > > > --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > > +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > > @@ -17,12 +17,15 @@ description: > > > > > > properties: > > > compatible: > > > - items: > > > - - enum: > > > - - renesas,r9a07g043-csi2 # RZ/G2UL > > > - - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > > - - renesas,r9a07g054-csi2 # RZ/V2L > > > - - const: renesas,rzg2l-csi2 > > > + oneOf: > > > + - items: > > > + - enum: > > > + - renesas,r9a07g043-csi2 # RZ/G2UL > > > + - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > > + - renesas,r9a07g054-csi2 # RZ/V2L > > > + - const: renesas,rzg2l-csi2 > > > + > > > > I'd drop the empty line. > > I'll drop this line in v2, thanks. > > > > + - const: renesas,r9a09g057-csi2 # RZ/V2H(P) > > > > > > reg: > > > maxItems: 1 > > > @@ -31,16 +34,24 @@ properties: > > > maxItems: 1 > > > > > > clocks: > > > - items: > > > - - description: Internal clock for connecting CRU and MIPI > > > - - description: CRU Main clock > > > - - description: CRU Register access clock > > > + oneOf: > > > + - items: > > > + - description: Internal clock for connecting CRU and MIPI > > > + - description: CRU Main clock > > > + - description: CRU Register access clock > > > + - items: > > > + - description: CRU Main clock > > > + - description: CRU Register access clock > > > > > > clock-names: > > > - items: > > > - - const: system > > > - - const: video > > > - - const: apb > > > + oneOf: > > > + - items: > > > + - const: system > > > + - const: video > > > + - const: apb > > > + - items: > > > + - const: video > > > + - const: apb > > > > I would move the clocks and clock-names definitions to the conditional > > below. Otherwise I think a device tree that has two clocks only but > > incorrectly uses "system" and "video" instead of "video" and "apb" will > > validate. > > Agreed. Taking as reference your work done on renesas,fcp.yaml. > What about the following? > > clocks: true > clock-names: true > > Then move the clocks and clock-names below as you suggested > into the conditional block: > > allOf: > - if: > properties: > compatible: > contains: > const: renesas,r9a09g057-csi2 > then: > properties: > clocks: > items: > - description: CRU Main clock > - description: CRU Register access clock > clock-names: > items: > - const: video > - const: apb > > else: > properties: > clocks: > items: > - description: Internal clock for connecting CRU and MIPI > - description: CRU Main clock > - description: CRU Register access clock > clock-names: > items: > - const: system > - const: video > - const: apb > > Thanks in advance. I do like that, but I think Krzysztof wasn't entirely happy with it (it could be a separate but similar issue though, I don't recall the details). I'd recommend checking with him (he's on CC, so he will probably reply unless the mail gets buried in a mailbox that I am sure fills up quite quickly). > > > > > > power-domains: > > > maxItems: 1 > > > @@ -48,7 +59,7 @@ properties: > > > resets: > > > items: > > > - description: CRU_PRESETN reset terminal > > > - - description: CRU_CMN_RSTB reset terminal > > > + - description: CRU_CMN_RSTB reset terminal or D-PHY reset > > > > > > reset-names: > > > items: > > > @@ -101,6 +112,28 @@ required: > > > - reset-names > > > - ports > > > > > > +allOf: > > > + - if: > > > + properties: > > > + compatible: > > > + contains: > > > + const: renesas,r9a09g057-csi2 > > > + then: > > > + properties: > > > + clocks: > > > + maxItems: 2 > > > + > > > + clock-names: > > > + maxItems: 2 > > > + > > > + else: > > > + properties: > > > + clocks: > > > + maxItems: 3 > > > + > > > + clock-names: > > > + maxItems: 3 > > > + > > > additionalProperties: false > > > > > > examples:
Hi Laurent, On Tue, Feb 18, 2025 at 02:35:03PM +0200, Laurent Pinchart wrote: > On Tue, Feb 18, 2025 at 12:55:22PM +0100, Tommaso Merciai wrote: > > On Fri, Feb 14, 2025 at 02:29:51AM +0200, Laurent Pinchart wrote: > > > On Mon, Feb 10, 2025 at 12:45:34PM +0100, Tommaso Merciai wrote: > > > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > > > > > The MIPI CSI-2 block on the Renesas RZ/V2H(P) SoC is similar to the one > > > > found on the Renesas RZ/G2L SoC, with the following differences: > > > > - A different D-PHY > > > > - Additional registers for the MIPI CSI-2 link > > > > - Only two clocks > > > > > > > > Add a new compatible string, `renesas,r9a09g057-csi2`, for the RZ/V2H(P) > > > > SoC. > > > > > > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com> > > > > --- > > > > .../bindings/media/renesas,rzg2l-csi2.yaml | 63 ++++++++++++++----- > > > > 1 file changed, 48 insertions(+), 15 deletions(-) > > > > > > > > diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > > > index 7faa12fecd5b..0d07c55a3f35 100644 > > > > --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > > > +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > > > @@ -17,12 +17,15 @@ description: > > > > > > > > properties: > > > > compatible: > > > > - items: > > > > - - enum: > > > > - - renesas,r9a07g043-csi2 # RZ/G2UL > > > > - - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > > > - - renesas,r9a07g054-csi2 # RZ/V2L > > > > - - const: renesas,rzg2l-csi2 > > > > + oneOf: > > > > + - items: > > > > + - enum: > > > > + - renesas,r9a07g043-csi2 # RZ/G2UL > > > > + - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > > > + - renesas,r9a07g054-csi2 # RZ/V2L > > > > + - const: renesas,rzg2l-csi2 > > > > + > > > > > > I'd drop the empty line. > > > > I'll drop this line in v2, thanks. > > > > > > + - const: renesas,r9a09g057-csi2 # RZ/V2H(P) > > > > > > > > reg: > > > > maxItems: 1 > > > > @@ -31,16 +34,24 @@ properties: > > > > maxItems: 1 > > > > > > > > clocks: > > > > - items: > > > > - - description: Internal clock for connecting CRU and MIPI > > > > - - description: CRU Main clock > > > > - - description: CRU Register access clock > > > > + oneOf: > > > > + - items: > > > > + - description: Internal clock for connecting CRU and MIPI > > > > + - description: CRU Main clock > > > > + - description: CRU Register access clock > > > > + - items: > > > > + - description: CRU Main clock > > > > + - description: CRU Register access clock > > > > > > > > clock-names: > > > > - items: > > > > - - const: system > > > > - - const: video > > > > - - const: apb > > > > + oneOf: > > > > + - items: > > > > + - const: system > > > > + - const: video > > > > + - const: apb > > > > + - items: > > > > + - const: video > > > > + - const: apb > > > > > > I would move the clocks and clock-names definitions to the conditional > > > below. Otherwise I think a device tree that has two clocks only but > > > incorrectly uses "system" and "video" instead of "video" and "apb" will > > > validate. > > > > Agreed. Taking as reference your work done on renesas,fcp.yaml. > > What about the following? > > > > clocks: true > > clock-names: true > > > > Then move the clocks and clock-names below as you suggested > > into the conditional block: > > > > allOf: > > - if: > > properties: > > compatible: > > contains: > > const: renesas,r9a09g057-csi2 > > then: > > properties: > > clocks: > > items: > > - description: CRU Main clock > > - description: CRU Register access clock > > clock-names: > > items: > > - const: video > > - const: apb > > > > else: > > properties: > > clocks: > > items: > > - description: Internal clock for connecting CRU and MIPI > > - description: CRU Main clock > > - description: CRU Register access clock > > clock-names: > > items: > > - const: system > > - const: video > > - const: apb > > > > Thanks in advance. > > I do like that, but I think Krzysztof wasn't entirely happy with it (it > could be a separate but similar issue though, I don't recall the > details). I'd recommend checking with him (he's on CC, so he will > probably reply unless the mail gets buried in a mailbox that I am sure > fills up quite quickly). I read a bit of the conversation you have on renesas,fcp. If I'm not missing something the suggestion was to use (in my case): clocks: minItems: 2 maxItems: 3 clock-names: minItems: 2 maxItems: 3 Instead of: clocks: true clock-names: true Please correct me if I'm missing somenthing. Thanks in advance. > > > > > > > > > power-domains: > > > > maxItems: 1 > > > > @@ -48,7 +59,7 @@ properties: > > > > resets: > > > > items: > > > > - description: CRU_PRESETN reset terminal > > > > - - description: CRU_CMN_RSTB reset terminal > > > > + - description: CRU_CMN_RSTB reset terminal or D-PHY reset > > > > > > > > reset-names: > > > > items: > > > > @@ -101,6 +112,28 @@ required: > > > > - reset-names > > > > - ports > > > > > > > > +allOf: > > > > + - if: > > > > + properties: > > > > + compatible: > > > > + contains: > > > > + const: renesas,r9a09g057-csi2 > > > > + then: > > > > + properties: > > > > + clocks: > > > > + maxItems: 2 > > > > + > > > > + clock-names: > > > > + maxItems: 2 > > > > + > > > > + else: > > > > + properties: > > > > + clocks: > > > > + maxItems: 3 > > > > + > > > > + clock-names: > > > > + maxItems: 3 > > > > + > > > > additionalProperties: false > > > > > > > > examples: > > -- > Regards, > > Laurent Pinchart Thanks & Regards, Tommaso
On Fri, Feb 14, 2025 at 02:29:51AM +0200, Laurent Pinchart wrote: > Hi Tommaso, Prabhakar, > > Thank you for the patch. > > On Mon, Feb 10, 2025 at 12:45:34PM +0100, Tommaso Merciai wrote: > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > The MIPI CSI-2 block on the Renesas RZ/V2H(P) SoC is similar to the one > > found on the Renesas RZ/G2L SoC, with the following differences: > > - A different D-PHY > > - Additional registers for the MIPI CSI-2 link > > - Only two clocks > > > > Add a new compatible string, `renesas,r9a09g057-csi2`, for the RZ/V2H(P) > > SoC. > > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com> > > --- > > .../bindings/media/renesas,rzg2l-csi2.yaml | 63 ++++++++++++++----- > > 1 file changed, 48 insertions(+), 15 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > index 7faa12fecd5b..0d07c55a3f35 100644 > > --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > @@ -17,12 +17,15 @@ description: > > > > properties: > > compatible: > > - items: > > - - enum: > > - - renesas,r9a07g043-csi2 # RZ/G2UL > > - - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > - - renesas,r9a07g054-csi2 # RZ/V2L > > - - const: renesas,rzg2l-csi2 > > + oneOf: > > + - items: > > + - enum: > > + - renesas,r9a07g043-csi2 # RZ/G2UL > > + - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > + - renesas,r9a07g054-csi2 # RZ/V2L > > + - const: renesas,rzg2l-csi2 > > + > > I'd drop the empty line. > > > + - const: renesas,r9a09g057-csi2 # RZ/V2H(P) > > > > reg: > > maxItems: 1 > > @@ -31,16 +34,24 @@ properties: > > maxItems: 1 > > > > clocks: > > - items: > > - - description: Internal clock for connecting CRU and MIPI > > - - description: CRU Main clock > > - - description: CRU Register access clock > > + oneOf: > > + - items: > > + - description: Internal clock for connecting CRU and MIPI > > + - description: CRU Main clock > > + - description: CRU Register access clock > > + - items: > > + - description: CRU Main clock > > + - description: CRU Register access clock > > > > clock-names: > > - items: > > - - const: system > > - - const: video > > - - const: apb > > + oneOf: > > + - items: > > + - const: system > > + - const: video > > + - const: apb > > + - items: > > + - const: video > > + - const: apb > > I would move the clocks and clock-names definitions to the conditional > below. Otherwise I think a device tree that has two clocks only but > incorrectly uses "system" and "video" instead of "video" and "apb" will > validate. No, that wouldn't be allowed. The preference is to have it like this because it discourages creating more variations. If the names are all defined in if/then schema, then you can just add a new one with any names you want. Though if the variations become such a mess, then defining them in the if/then schemas would probably be better. It would be better if 'clocks' could be reworked to avoid the 'oneOf' though (oneOf == poor error messages). It just needs a 'minItems: 2' added and the descriptions reworded for both cases. Rob
On Mon, Feb 10, 2025 at 12:45:34PM +0100, Tommaso Merciai wrote: > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > The MIPI CSI-2 block on the Renesas RZ/V2H(P) SoC is similar to the one > found on the Renesas RZ/G2L SoC, with the following differences: > - A different D-PHY > - Additional registers for the MIPI CSI-2 link > - Only two clocks > > Add a new compatible string, `renesas,r9a09g057-csi2`, for the RZ/V2H(P) > SoC. > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com> > --- > .../bindings/media/renesas,rzg2l-csi2.yaml | 63 ++++++++++++++----- > 1 file changed, 48 insertions(+), 15 deletions(-) > > diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > index 7faa12fecd5b..0d07c55a3f35 100644 > --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > @@ -17,12 +17,15 @@ description: > > properties: > compatible: > - items: > - - enum: > - - renesas,r9a07g043-csi2 # RZ/G2UL > - - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > - - renesas,r9a07g054-csi2 # RZ/V2L > - - const: renesas,rzg2l-csi2 > + oneOf: > + - items: > + - enum: > + - renesas,r9a07g043-csi2 # RZ/G2UL > + - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > + - renesas,r9a07g054-csi2 # RZ/V2L > + - const: renesas,rzg2l-csi2 > + > + - const: renesas,r9a09g057-csi2 # RZ/V2H(P) > > reg: > maxItems: 1 > @@ -31,16 +34,24 @@ properties: > maxItems: 1 > > clocks: > - items: > - - description: Internal clock for connecting CRU and MIPI > - - description: CRU Main clock > - - description: CRU Register access clock > + oneOf: > + - items: > + - description: Internal clock for connecting CRU and MIPI > + - description: CRU Main clock > + - description: CRU Register access clock > + - items: > + - description: CRU Main clock > + - description: CRU Register access clock > > clock-names: > - items: > - - const: system > - - const: video > - - const: apb > + oneOf: > + - items: > + - const: system > + - const: video > + - const: apb > + - items: > + - const: video > + - const: apb > > power-domains: > maxItems: 1 > @@ -48,7 +59,7 @@ properties: > resets: > items: > - description: CRU_PRESETN reset terminal > - - description: CRU_CMN_RSTB reset terminal > + - description: CRU_CMN_RSTB reset terminal or D-PHY reset > > reset-names: > items: > @@ -101,6 +112,28 @@ required: > - reset-names > - ports > > +allOf: > + - if: > + properties: > + compatible: > + contains: > + const: renesas,r9a09g057-csi2 > + then: > + properties: > + clocks: > + maxItems: 2 > + > + clock-names: > + maxItems: 2 These are correct, but... > + > + else: > + properties: > + clocks: > + maxItems: 3 > + > + clock-names: > + maxItems: 3 3 is already the max. You need 'minItems' here. Rob
On Wed, Feb 19, 2025 at 08:51:39AM -0600, Rob Herring wrote: > On Fri, Feb 14, 2025 at 02:29:51AM +0200, Laurent Pinchart wrote: > > Hi Tommaso, Prabhakar, > > > > Thank you for the patch. > > > > On Mon, Feb 10, 2025 at 12:45:34PM +0100, Tommaso Merciai wrote: > > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > > > The MIPI CSI-2 block on the Renesas RZ/V2H(P) SoC is similar to the one > > > found on the Renesas RZ/G2L SoC, with the following differences: > > > - A different D-PHY > > > - Additional registers for the MIPI CSI-2 link > > > - Only two clocks > > > > > > Add a new compatible string, `renesas,r9a09g057-csi2`, for the RZ/V2H(P) > > > SoC. > > > > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com> > > > --- > > > .../bindings/media/renesas,rzg2l-csi2.yaml | 63 ++++++++++++++----- > > > 1 file changed, 48 insertions(+), 15 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > > index 7faa12fecd5b..0d07c55a3f35 100644 > > > --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > > +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml > > > @@ -17,12 +17,15 @@ description: > > > > > > properties: > > > compatible: > > > - items: > > > - - enum: > > > - - renesas,r9a07g043-csi2 # RZ/G2UL > > > - - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > > - - renesas,r9a07g054-csi2 # RZ/V2L > > > - - const: renesas,rzg2l-csi2 > > > + oneOf: > > > + - items: > > > + - enum: > > > + - renesas,r9a07g043-csi2 # RZ/G2UL > > > + - renesas,r9a07g044-csi2 # RZ/G2{L,LC} > > > + - renesas,r9a07g054-csi2 # RZ/V2L > > > + - const: renesas,rzg2l-csi2 > > > + > > > > I'd drop the empty line. > > > > > + - const: renesas,r9a09g057-csi2 # RZ/V2H(P) > > > > > > reg: > > > maxItems: 1 > > > @@ -31,16 +34,24 @@ properties: > > > maxItems: 1 > > > > > > clocks: > > > - items: > > > - - description: Internal clock for connecting CRU and MIPI > > > - - description: CRU Main clock > > > - - description: CRU Register access clock > > > + oneOf: > > > + - items: > > > + - description: Internal clock for connecting CRU and MIPI > > > + - description: CRU Main clock > > > + - description: CRU Register access clock > > > + - items: > > > + - description: CRU Main clock > > > + - description: CRU Register access clock > > > > > > clock-names: > > > - items: > > > - - const: system > > > - - const: video > > > - - const: apb > > > + oneOf: > > > + - items: > > > + - const: system > > > + - const: video > > > + - const: apb > > > + - items: > > > + - const: video > > > + - const: apb > > > > I would move the clocks and clock-names definitions to the conditional > > below. Otherwise I think a device tree that has two clocks only but > > incorrectly uses "system" and "video" instead of "video" and "apb" will > > validate. > > No, that wouldn't be allowed. The preference is to have it like this > because it discourages creating more variations. If the names are all > defined in if/then schema, then you can just add a new one with any > names you want. Though if the variations become such a mess, then > defining them in the if/then schemas would probably be better. > > It would be better if 'clocks' could be reworked to avoid the 'oneOf' > though (oneOf == poor error messages). It just needs a 'minItems: 2' > added and the descriptions reworded for both cases. Don't the items in clocks need to match the items in clock-names ? We can't reorder clock-names items as that would be an ABI breakage, so we can't reorder clocks items either.
diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml index 7faa12fecd5b..0d07c55a3f35 100644 --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml @@ -17,12 +17,15 @@ description: properties: compatible: - items: - - enum: - - renesas,r9a07g043-csi2 # RZ/G2UL - - renesas,r9a07g044-csi2 # RZ/G2{L,LC} - - renesas,r9a07g054-csi2 # RZ/V2L - - const: renesas,rzg2l-csi2 + oneOf: + - items: + - enum: + - renesas,r9a07g043-csi2 # RZ/G2UL + - renesas,r9a07g044-csi2 # RZ/G2{L,LC} + - renesas,r9a07g054-csi2 # RZ/V2L + - const: renesas,rzg2l-csi2 + + - const: renesas,r9a09g057-csi2 # RZ/V2H(P) reg: maxItems: 1 @@ -31,16 +34,24 @@ properties: maxItems: 1 clocks: - items: - - description: Internal clock for connecting CRU and MIPI - - description: CRU Main clock - - description: CRU Register access clock + oneOf: + - items: + - description: Internal clock for connecting CRU and MIPI + - description: CRU Main clock + - description: CRU Register access clock + - items: + - description: CRU Main clock + - description: CRU Register access clock clock-names: - items: - - const: system - - const: video - - const: apb + oneOf: + - items: + - const: system + - const: video + - const: apb + - items: + - const: video + - const: apb power-domains: maxItems: 1 @@ -48,7 +59,7 @@ properties: resets: items: - description: CRU_PRESETN reset terminal - - description: CRU_CMN_RSTB reset terminal + - description: CRU_CMN_RSTB reset terminal or D-PHY reset reset-names: items: @@ -101,6 +112,28 @@ required: - reset-names - ports +allOf: + - if: + properties: + compatible: + contains: + const: renesas,r9a09g057-csi2 + then: + properties: + clocks: + maxItems: 2 + + clock-names: + maxItems: 2 + + else: + properties: + clocks: + maxItems: 3 + + clock-names: + maxItems: 3 + additionalProperties: false examples: