Skip to content

Commit d95bca4

Browse files
bebarinodtor
authored andcommitted
dt-bindings: google,cros-ec-keyb: Fixup bad compatible match
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>
1 parent ca1eadb commit d95bca4

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ description: |
2020
2121
properties:
2222
compatible:
23-
anyOf:
23+
oneOf:
2424
- description: ChromeOS EC with only buttons/switches
25-
- items:
26-
- const: google,cros-ec-keyb-switches
25+
const: google,cros-ec-keyb-switches
2726
- description: ChromeOS EC with keyboard and possibly buttons/switches
28-
- items:
29-
- const: google,cros-ec-keyb
27+
const: google,cros-ec-keyb
3028

3129
google,needs-ghost-filter:
3230
description:
@@ -58,8 +56,7 @@ if:
5856
contains:
5957
const: google,cros-ec-keyb
6058
then:
61-
allOf:
62-
- $ref: "/schemas/input/matrix-keymap.yaml#"
59+
$ref: "/schemas/input/matrix-keymap.yaml#"
6360
required:
6461
- keypad,num-rows
6562
- keypad,num-columns

0 commit comments

Comments
 (0)