From 3d21a46093352f7802b9c66c7cce35cd02a50e53 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 15 Apr 2020 19:55:49 -0500 Subject: dt-bindings: Remove cases of 'allOf' containing a '$ref' json-schema versions draft7 and earlier have a weird behavior in that any keywords combined with a '$ref' are ignored (silently). The correct form was to put a '$ref' under an 'allOf'. This behavior is now changed in the 2019-09 json-schema spec and '$ref' can be mixed with other keywords. The json-schema library doesn't yet support this, but the tooling now does a fixup for this and either way works. This has been a constant source of review comments, so let's change this treewide so everyone copies the simpler syntax. Scripted with ruamel.yaml with some manual fixups. Some minor whitespace changes from the script. Signed-off-by: Rob Herring Acked-by: Maxime Ripard Acked-by: Lee Jones Acked-By: Vinod Koul Acked-by: Mark Brown Acked-by: Alexandre Belloni Acked-by: Wolfram Sang # for I2C Reviewed-by: Linus Walleij Acked-by: Jonathan Cameron #for-iio Reviewed-by: Stephen Boyd # clock Signed-off-by: Rob Herring --- .../devicetree/bindings/input/gpio-keys.yaml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'Documentation/devicetree/bindings/input/gpio-keys.yaml') diff --git a/Documentation/devicetree/bindings/input/gpio-keys.yaml b/Documentation/devicetree/bindings/input/gpio-keys.yaml index c0b389572340..6966ab009fa3 100644 --- a/Documentation/devicetree/bindings/input/gpio-keys.yaml +++ b/Documentation/devicetree/bindings/input/gpio-keys.yaml @@ -20,8 +20,7 @@ patternProperties: if: type: object then: - allOf: - - $ref: input.yaml# + $ref: input.yaml# properties: gpios: @@ -41,8 +40,8 @@ patternProperties: description: Specify event type this button/key generates. If not specified defaults to <1> == EV_KEY. - allOf: - - $ref: /schemas/types.yaml#definitions/uint32 + $ref: /schemas/types.yaml#definitions/uint32 + default: 1 linux,input-value: @@ -57,14 +56,13 @@ patternProperties: linux,input-value = <0xffffffff>; /* -1 */ - allOf: - - $ref: /schemas/types.yaml#definitions/uint32 + $ref: /schemas/types.yaml#definitions/uint32 debounce-interval: description: Debouncing interval time in milliseconds. If not specified defaults to 5. - allOf: - - $ref: /schemas/types.yaml#definitions/uint32 + $ref: /schemas/types.yaml#definitions/uint32 + default: 5 wakeup-source: @@ -81,9 +79,8 @@ patternProperties: EV_ACT_ANY - both asserted and deasserted EV_ACT_ASSERTED - asserted EV_ACT_DEASSERTED - deasserted - allOf: - - $ref: /schemas/types.yaml#definitions/uint32 - enum: [ 0, 1, 2 ] + $ref: /schemas/types.yaml#definitions/uint32 + enum: [0, 1, 2] linux,can-disable: description: -- cgit