[RESEND,5.10.y-cip,32/40] dt-bindings: Fix errors in 'if' schemas

Commit Message

Lad Prabhakar April 1, 2022, 7:42 p.m. UTC

From: Rob Herring <[e-mail]>

commit 9183908e70e913d2db052588172968da55d82af5 upstream.

Properties in if/then schemas weren't getting checked by the meta-schemas.
Enabling meta-schema checks finds several errors.

The use of an 'items' schema (as opposed to the list form) is wrong in
some cases as it applies to all entries. 'contains' is the correct schema
to use in the case of multiple entries.

Cc: Herbert Xu <[e-mail]>
Cc: "David S. Miller" <[e-mail]>
Cc: Chen-Yu Tsai <[e-mail]>
Cc: Eric Anholt <[e-mail]>
Cc: Florian Fainelli <[e-mail]>
Cc: Ray Jui <[e-mail]>
Cc: Scott Branden <[e-mail]>
Cc: Pavel Machek <[e-mail]>
Cc: Ulf Hansson <[e-mail]>
Cc: Kishon Vijay Abraham I <[e-mail]>
Cc: Geert Uytterhoeven <[e-mail]>
Cc: Linus Walleij <[e-mail]>
Cc: Daniel Lezcano <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Acked-by: Maxime Ripard <[e-mail]>
Acked-By: Vinod Koul <[e-mail]>
Reviewed-by: Nicolas Saenz Julienne <[e-mail]>
Acked-by: Geert Uytterhoeven <[e-mail]>
Signed-off-by: Rob Herring <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
[PL: Only applied changes to renesas,sdhi.yaml]
Signed-off-by: Lad Prabhakar <[e-mail]>
---
 Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
index 6bbf29b5c239..6c13703b31db 100644
--- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
+++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
@@ -123,7 +123,7 @@  required:
 if:
   properties:
     compatible:
-      items:
+      contains:
         enum:
           - renesas,sdhi-r7s72100
           - renesas,sdhi-r7s9210