From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Drop 'items' keyword from compatible list which have single const value.
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
.../devicetree/bindings/mmc/renesas,sdhi.yaml | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
index 29f2400247eb..90c8b1b727a8 100644
--- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
+++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
@@ -12,16 +12,11 @@ maintainers:
properties:
compatible:
oneOf:
- - items:
- - const: renesas,sdhi-sh73a0 # R-Mobile APE6
- - items:
- - const: renesas,sdhi-r7s72100 # RZ/A1H
- - items:
- - const: renesas,sdhi-r7s9210 # SH-Mobile AG5
- - items:
- - const: renesas,sdhi-r8a73a4 # R-Mobile APE6
- - items:
- - const: renesas,sdhi-r8a7740 # R-Mobile A1
+ - const: renesas,sdhi-sh73a0 # R-Mobile APE6
+ - const: renesas,sdhi-r7s72100 # RZ/A1H
+ - const: renesas,sdhi-r7s9210 # SH-Mobile AG5
+ - const: renesas,sdhi-r8a73a4 # R-Mobile APE6
+ - const: renesas,sdhi-r8a7740 # R-Mobile A1
- items:
- enum:
- renesas,sdhi-r8a7778 # R-Car M1
@@ -40,8 +35,7 @@ properties:
- renesas,sdhi-r8a7793 # R-Car M2-N
- renesas,sdhi-r8a7794 # R-Car E2
- const: renesas,rcar-gen2-sdhi # R-Car Gen2 and RZ/G1
- - items:
- - const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP)
+ - const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP)
- items:
- enum:
- renesas,sdhi-r8a774a1 # RZ/G2M
--
2.34.1
On 22/04/2024 23:30, Prabhakar wrote: > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > Drop 'items' keyword from compatible list which have single const value. > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > --- > .../devicetree/bindings/mmc/renesas,sdhi.yaml | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > index 29f2400247eb..90c8b1b727a8 100644 > --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > @@ -12,16 +12,11 @@ maintainers: > properties: > compatible: > oneOf: > - - items: > - - const: renesas,sdhi-sh73a0 # R-Mobile APE6 > - - items: > - - const: renesas,sdhi-r7s72100 # RZ/A1H > - - items: > - - const: renesas,sdhi-r7s9210 # SH-Mobile AG5 > - - items: > - - const: renesas,sdhi-r8a73a4 # R-Mobile APE6 > - - items: > - - const: renesas,sdhi-r8a7740 # R-Mobile A1 > + - const: renesas,sdhi-sh73a0 # R-Mobile APE6 > + - const: renesas,sdhi-r7s72100 # RZ/A1H > + - const: renesas,sdhi-r7s9210 # SH-Mobile AG5 > + - const: renesas,sdhi-r8a73a4 # R-Mobile APE6 > + - const: renesas,sdhi-r8a7740 # R-Mobile A1 That's just an enum. > - items: > - enum: > - renesas,sdhi-r8a7778 # R-Car M1 > @@ -40,8 +35,7 @@ properties: > - renesas,sdhi-r8a7793 # R-Car M2-N > - renesas,sdhi-r8a7794 # R-Car E2 > - const: renesas,rcar-gen2-sdhi # R-Car Gen2 and RZ/G1 > - - items: > - - const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP) > + - const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP) This as well Best regards, Krzysztof
Hi Krzysztof, Thank you for the review. On Tue, Apr 23, 2024 at 7:29 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On 22/04/2024 23:30, Prabhakar wrote: > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > Drop 'items' keyword from compatible list which have single const value. > > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > --- > > .../devicetree/bindings/mmc/renesas,sdhi.yaml | 18 ++++++------------ > > 1 file changed, 6 insertions(+), 12 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > > index 29f2400247eb..90c8b1b727a8 100644 > > --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > > +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > > @@ -12,16 +12,11 @@ maintainers: > > properties: > > compatible: > > oneOf: > > - - items: > > - - const: renesas,sdhi-sh73a0 # R-Mobile APE6 > > - - items: > > - - const: renesas,sdhi-r7s72100 # RZ/A1H > > - - items: > > - - const: renesas,sdhi-r7s9210 # SH-Mobile AG5 > > - - items: > > - - const: renesas,sdhi-r8a73a4 # R-Mobile APE6 > > - - items: > > - - const: renesas,sdhi-r8a7740 # R-Mobile A1 > > + - const: renesas,sdhi-sh73a0 # R-Mobile APE6 > > + - const: renesas,sdhi-r7s72100 # RZ/A1H > > + - const: renesas,sdhi-r7s9210 # SH-Mobile AG5 > > + - const: renesas,sdhi-r8a73a4 # R-Mobile APE6 > > + - const: renesas,sdhi-r8a7740 # R-Mobile A1 > > That's just an enum. > Are you suggesting to group them into a single enum instead...? > > - items: > > - enum: > > - renesas,sdhi-r8a7778 # R-Car M1 > > @@ -40,8 +35,7 @@ properties: > > - renesas,sdhi-r8a7793 # R-Car M2-N > > - renesas,sdhi-r8a7794 # R-Car E2 > > - const: renesas,rcar-gen2-sdhi # R-Car Gen2 and RZ/G1 > > - - items: > > - - const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP) > > + - const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP) > > This as well ... including this? Cheers, Prabhakar
On 23/04/2024 09:21, Lad, Prabhakar wrote: > Hi Krzysztof, > > Thank you for the review. > > On Tue, Apr 23, 2024 at 7:29 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: >> >> On 22/04/2024 23:30, Prabhakar wrote: >>> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> >>> >>> Drop 'items' keyword from compatible list which have single const value. >>> >>> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> >>> --- >>> .../devicetree/bindings/mmc/renesas,sdhi.yaml | 18 ++++++------------ >>> 1 file changed, 6 insertions(+), 12 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml >>> index 29f2400247eb..90c8b1b727a8 100644 >>> --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml >>> +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml >>> @@ -12,16 +12,11 @@ maintainers: >>> properties: >>> compatible: >>> oneOf: >>> - - items: >>> - - const: renesas,sdhi-sh73a0 # R-Mobile APE6 >>> - - items: >>> - - const: renesas,sdhi-r7s72100 # RZ/A1H >>> - - items: >>> - - const: renesas,sdhi-r7s9210 # SH-Mobile AG5 >>> - - items: >>> - - const: renesas,sdhi-r8a73a4 # R-Mobile APE6 >>> - - items: >>> - - const: renesas,sdhi-r8a7740 # R-Mobile A1 >>> + - const: renesas,sdhi-sh73a0 # R-Mobile APE6 >>> + - const: renesas,sdhi-r7s72100 # RZ/A1H >>> + - const: renesas,sdhi-r7s9210 # SH-Mobile AG5 >>> + - const: renesas,sdhi-r8a73a4 # R-Mobile APE6 >>> + - const: renesas,sdhi-r8a7740 # R-Mobile A1 >> >> That's just an enum. >> > Are you suggesting to group them into a single enum instead...? Yes. That's preferred form, easier to read, because it clearly documents that binding enumerates. But just in case you start changing all const to enums: don't. Comment is for this patch, since you already want to touch these things. Best regards, Krzysztof
On Tue, Apr 23, 2024 at 10:59 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On 23/04/2024 09:21, Lad, Prabhakar wrote: > > Hi Krzysztof, > > > > Thank you for the review. > > > > On Tue, Apr 23, 2024 at 7:29 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > >> > >> On 22/04/2024 23:30, Prabhakar wrote: > >>> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > >>> > >>> Drop 'items' keyword from compatible list which have single const value. > >>> > >>> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > >>> --- > >>> .../devicetree/bindings/mmc/renesas,sdhi.yaml | 18 ++++++------------ > >>> 1 file changed, 6 insertions(+), 12 deletions(-) > >>> > >>> diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > >>> index 29f2400247eb..90c8b1b727a8 100644 > >>> --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > >>> +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > >>> @@ -12,16 +12,11 @@ maintainers: > >>> properties: > >>> compatible: > >>> oneOf: > >>> - - items: > >>> - - const: renesas,sdhi-sh73a0 # R-Mobile APE6 > >>> - - items: > >>> - - const: renesas,sdhi-r7s72100 # RZ/A1H > >>> - - items: > >>> - - const: renesas,sdhi-r7s9210 # SH-Mobile AG5 > >>> - - items: > >>> - - const: renesas,sdhi-r8a73a4 # R-Mobile APE6 > >>> - - items: > >>> - - const: renesas,sdhi-r8a7740 # R-Mobile A1 > >>> + - const: renesas,sdhi-sh73a0 # R-Mobile APE6 > >>> + - const: renesas,sdhi-r7s72100 # RZ/A1H > >>> + - const: renesas,sdhi-r7s9210 # SH-Mobile AG5 > >>> + - const: renesas,sdhi-r8a73a4 # R-Mobile APE6 > >>> + - const: renesas,sdhi-r8a7740 # R-Mobile A1 > >> > >> That's just an enum. > >> > > Are you suggesting to group them into a single enum instead...? > > Yes. That's preferred form, easier to read, because it clearly documents > that binding enumerates. > Agreed. > But just in case you start changing all const to enums: don't. Comment > is for this patch, since you already want to touch these things. > Indeed. Cheers, Prabhakar
© 2016 - 2026 Red Hat, Inc.