]> git.baikalelectronics.ru Git - kernel.git/commitdiff
dt-bindings: google,cros-ec-keyb: Fixup bad compatible match
authorStephen Boyd <swboyd@chromium.org>
Wed, 18 May 2022 22:00:08 +0000 (15:00 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 18 May 2022 22:01:06 +0000 (15:01 -0700)
This uses anyOf which is wrong. Use oneOf and move the items under the
description. Also drop allOf for $ref.

Reported-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/CAE-0n50KE9bkqZvCOLtCGiq3g1jYhK7zpVcVFBzinaguNhNaPw@mail.gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml

index e11cbf508723529dc7b10e76eb7f5dc1dd7a2a43..c31a02149f37f143267f7b79ff0d0b5af71d0cd3 100644 (file)
@@ -20,13 +20,11 @@ description: |
 
 properties:
   compatible:
-    anyOf:
+    oneOf:
       - description: ChromeOS EC with only buttons/switches
-      - items:
-          - const: google,cros-ec-keyb-switches
+        const: google,cros-ec-keyb-switches
       - description: ChromeOS EC with keyboard and possibly buttons/switches
-      - items:
-          - const: google,cros-ec-keyb
+        const: google,cros-ec-keyb
 
   google,needs-ghost-filter:
     description:
@@ -58,8 +56,7 @@ if:
       contains:
         const: google,cros-ec-keyb
 then:
-  allOf:
-    - $ref: "/schemas/input/matrix-keymap.yaml#"
+  $ref: "/schemas/input/matrix-keymap.yaml#"
   required:
     - keypad,num-rows
     - keypad,num-columns