From d95bca4fbde0a29a3d987c39fd17e414f1ed5ec6 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Wed, 18 May 2022 15:00:08 -0700 Subject: [PATCH] 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 Signed-off-by: Stephen Boyd Link: https://lore.kernel.org/r/CAE-0n50KE9bkqZvCOLtCGiq3g1jYhK7zpVcVFBzinaguNhNaPw@mail.gmail.com Signed-off-by: Dmitry Torokhov --- .../devicetree/bindings/input/google,cros-ec-keyb.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml b/Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml index e11cbf5..c31a021 100644 --- a/Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml +++ b/Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml @@ -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 -- 2.7.4