| Message ID | 20220608211207.2058487-3-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | 8ac14d2c2d81f6a78539ce9670d9283b70a23bf8 |
| Headers | show |
| Series | dt-bindings: input: Common property clean-ups and adc-keys conversion | expand |
Hi Rob, On Wed, Jun 08, 2022 at 03:12:04PM -0600, Rob Herring wrote: > Multiple bindings use 'linux,code', but there is not a central > definition and type. Add 'linux,code' to input.yaml and update all the > users to use it. > > Signed-off-by: Rob Herring <robh@kernel.org> For *iqs*.yaml: Acked-by: Jeff LaBundy <jeff@labundy.com> > --- > .../devicetree/bindings/input/adc-joystick.yaml | 2 +- > .../input/allwinner,sun4i-a10-lradc-keys.yaml | 5 ++--- > .../devicetree/bindings/input/azoteq,iqs7222.yaml | 7 ++----- > .../devicetree/bindings/input/gpio-keys.yaml | 1 - > .../devicetree/bindings/input/input.yaml | 8 ++++++++ > .../devicetree/bindings/input/iqs269a.yaml | 15 ++++++--------- > .../devicetree/bindings/input/iqs626a.yaml | 5 ++--- > .../devicetree/bindings/input/iqs62x-keys.yaml | 5 ++--- > .../devicetree/bindings/input/max77650-onkey.yaml | 8 ++++---- > 9 files changed, 27 insertions(+), 29 deletions(-) > > diff --git a/Documentation/devicetree/bindings/input/adc-joystick.yaml b/Documentation/devicetree/bindings/input/adc-joystick.yaml > index 2ee04e03bc22..64d961458ac7 100644 > --- a/Documentation/devicetree/bindings/input/adc-joystick.yaml > +++ b/Documentation/devicetree/bindings/input/adc-joystick.yaml > @@ -45,6 +45,7 @@ additionalProperties: false > patternProperties: > "^axis@[0-9a-f]+$": > type: object > + $ref: input.yaml# > description: > > Represents a joystick axis bound to the given ADC channel. > For each entry in the io-channels list, one axis subnode with a matching > @@ -57,7 +58,6 @@ patternProperties: > description: Index of an io-channels list entry bound to this axis. > > linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > description: EV_ABS specific event code generated by the axis. > > abs-range: > diff --git a/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml b/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml > index 3399fc288afb..9700dc468b25 100644 > --- a/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml > +++ b/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml > @@ -44,14 +44,13 @@ properties: > patternProperties: > "^button-[0-9]+$": > type: object > + $ref: input.yaml# > properties: > label: > $ref: /schemas/types.yaml#/definitions/string > description: Descriptive name of the key > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Keycode to emit > + linux,code: true > > channel: > $ref: /schemas/types.yaml#/definitions/uint32 > diff --git a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml > index a3a1e5a65306..5ea10fe7ffe9 100644 > --- a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml > +++ b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml > @@ -421,6 +421,7 @@ patternProperties: > patternProperties: > "^event-(prox|touch)$": > type: object > + $ref: input.yaml# > description: > Represents a proximity or touch event reported by the channel. > > @@ -467,11 +468,7 @@ patternProperties: > The IQS7222B does not feature channel-specific timeouts; the time- > out specified for any one channel applies to all channels. > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: > - Numeric key or switch code associated with the event. Specify > - KEY_RESERVED (0) to opt out of event reporting. > + linux,code: true > > linux,input-type: > $ref: /schemas/types.yaml#/definitions/uint32 > diff --git a/Documentation/devicetree/bindings/input/gpio-keys.yaml b/Documentation/devicetree/bindings/input/gpio-keys.yaml > index 7fe1966ea28a..cd07107fd5ed 100644 > --- a/Documentation/devicetree/bindings/input/gpio-keys.yaml > +++ b/Documentation/devicetree/bindings/input/gpio-keys.yaml > @@ -34,7 +34,6 @@ patternProperties: > > linux,code: > description: Key / Axis code to emit. > - $ref: /schemas/types.yaml#/definitions/uint32 > > linux,input-type: > description: > diff --git a/Documentation/devicetree/bindings/input/input.yaml b/Documentation/devicetree/bindings/input/input.yaml > index 43d2f299c332..e3701a0bc500 100644 > --- a/Documentation/devicetree/bindings/input/input.yaml > +++ b/Documentation/devicetree/bindings/input/input.yaml > @@ -23,6 +23,14 @@ properties: > minimum: 0 > maximum: 0x2ff > > + linux,code: > + description: > + Specifies a single numeric keycode value to be used for reporting > + button/switch events. Specify KEY_RESERVED (0) to opt out of event > + reporting. > + $ref: /schemas/types.yaml#/definitions/uint32 > + maximum: 0x2ff > + > poll-interval: > description: Poll interval time in milliseconds. > $ref: /schemas/types.yaml#/definitions/uint32 > diff --git a/Documentation/devicetree/bindings/input/iqs269a.yaml b/Documentation/devicetree/bindings/input/iqs269a.yaml > index 9c154e5e1a91..c22f8f27913a 100644 > --- a/Documentation/devicetree/bindings/input/iqs269a.yaml > +++ b/Documentation/devicetree/bindings/input/iqs269a.yaml > @@ -370,6 +370,7 @@ patternProperties: > patternProperties: > "^event-prox(-alt)?$": > type: object > + $ref: input.yaml# > description: > Represents a proximity event reported by the channel in response to > a decrease in counts. Node names suffixed with '-alt' instead corre- > @@ -396,14 +397,13 @@ patternProperties: > default: 10 > description: Specifies the threshold for the event. > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric key or switch code associated with the event. > + linux,code: true > > additionalProperties: false > > "^event-touch(-alt)?$": > type: object > + $ref: input.yaml# > description: Represents a touch event reported by the channel. > > properties: > @@ -421,14 +421,13 @@ patternProperties: > default: 4 > description: Specifies the hysteresis for the event. > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric key or switch code associated with the event. > + linux,code: true > > additionalProperties: false > > "^event-deep(-alt)?$": > type: object > + $ref: input.yaml# > description: Represents a deep-touch event reported by the channel. > > properties: > @@ -446,9 +445,7 @@ patternProperties: > default: 0 > description: Specifies the hysteresis for the event. > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric key or switch code associated with the event. > + linux,code: true > > additionalProperties: false > > diff --git a/Documentation/devicetree/bindings/input/iqs626a.yaml b/Documentation/devicetree/bindings/input/iqs626a.yaml > index 0cb736c541c9..e645521da8ba 100644 > --- a/Documentation/devicetree/bindings/input/iqs626a.yaml > +++ b/Documentation/devicetree/bindings/input/iqs626a.yaml > @@ -449,6 +449,7 @@ patternProperties: > patternProperties: > "^event-(prox|touch|deep)(-alt)?$": > type: object > + $ref: input.yaml# > description: > Represents a proximity, touch or deep-touch event reported by the > channel in response to a decrease in counts. Node names suffixed with > @@ -487,9 +488,7 @@ patternProperties: > Specifies the hysteresis for the event (touch and deep-touch > events only). > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric key or switch code associated with the event. > + linux,code: true > > linux,input-type: > $ref: /schemas/types.yaml#/definitions/uint32 > diff --git a/Documentation/devicetree/bindings/input/iqs62x-keys.yaml b/Documentation/devicetree/bindings/input/iqs62x-keys.yaml > index 77fe3b545b35..e677e31fe8fe 100644 > --- a/Documentation/devicetree/bindings/input/iqs62x-keys.yaml > +++ b/Documentation/devicetree/bindings/input/iqs62x-keys.yaml > @@ -89,15 +89,14 @@ properties: > patternProperties: > "^hall-switch-(north|south)$": > type: object > + $ref: input.yaml# > description: > Represents north/south-field Hall-effect sensor touch or proximity > events. Note that north/south-field orientation is reversed on the > IQS620AXzCSR device due to its flip-chip package. > > properties: > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric switch code associated with the event. > + linux,code: true > > azoteq,use-prox: > $ref: /schemas/types.yaml#/definitions/flag > diff --git a/Documentation/devicetree/bindings/input/max77650-onkey.yaml b/Documentation/devicetree/bindings/input/max77650-onkey.yaml > index 3a2ad6ec64db..48edc0c8c1dd 100644 > --- a/Documentation/devicetree/bindings/input/max77650-onkey.yaml > +++ b/Documentation/devicetree/bindings/input/max77650-onkey.yaml > @@ -16,15 +16,15 @@ description: | > The onkey controller is represented as a sub-node of the PMIC node on > the device tree. > > +allOf: > + - $ref: input.yaml# > + > properties: > compatible: > const: maxim,max77650-onkey > > linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: > - The key-code to be reported when the key is pressed. Defaults > - to KEY_POWER. > + default: 116 # KEY_POWER > > maxim,onkey-slide: > $ref: /schemas/types.yaml#/definitions/flag > -- > 2.34.1 > Kind regards, Jeff LaBundy
On 2022-06-08 23:12, Rob Herring wrote: > Multiple bindings use 'linux,code', but there is not a central > definition and type. Add 'linux,code' to input.yaml and update all the > users to use it. > > Signed-off-by: Rob Herring <robh@kernel.org> For adc-joystick.yaml: Acked-by: Artur Rojek <contact@artur-rojek.eu> > --- > .../devicetree/bindings/input/adc-joystick.yaml | 2 +- > .../input/allwinner,sun4i-a10-lradc-keys.yaml | 5 ++--- > .../devicetree/bindings/input/azoteq,iqs7222.yaml | 7 ++----- > .../devicetree/bindings/input/gpio-keys.yaml | 1 - > .../devicetree/bindings/input/input.yaml | 8 ++++++++ > .../devicetree/bindings/input/iqs269a.yaml | 15 ++++++--------- > .../devicetree/bindings/input/iqs626a.yaml | 5 ++--- > .../devicetree/bindings/input/iqs62x-keys.yaml | 5 ++--- > .../devicetree/bindings/input/max77650-onkey.yaml | 8 ++++---- > 9 files changed, 27 insertions(+), 29 deletions(-) > > diff --git a/Documentation/devicetree/bindings/input/adc-joystick.yaml > b/Documentation/devicetree/bindings/input/adc-joystick.yaml > index 2ee04e03bc22..64d961458ac7 100644 > --- a/Documentation/devicetree/bindings/input/adc-joystick.yaml > +++ b/Documentation/devicetree/bindings/input/adc-joystick.yaml > @@ -45,6 +45,7 @@ additionalProperties: false > patternProperties: > "^axis@[0-9a-f]+$": > type: object > + $ref: input.yaml# > description: > > Represents a joystick axis bound to the given ADC channel. > For each entry in the io-channels list, one axis subnode with a > matching > @@ -57,7 +58,6 @@ patternProperties: > description: Index of an io-channels list entry bound to this > axis. > > linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > description: EV_ABS specific event code generated by the axis. > > abs-range: > diff --git > a/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml > b/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml > index 3399fc288afb..9700dc468b25 100644 > --- > a/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml > +++ > b/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml > @@ -44,14 +44,13 @@ properties: > patternProperties: > "^button-[0-9]+$": > type: object > + $ref: input.yaml# > properties: > label: > $ref: /schemas/types.yaml#/definitions/string > description: Descriptive name of the key > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Keycode to emit > + linux,code: true > > channel: > $ref: /schemas/types.yaml#/definitions/uint32 > diff --git > a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml > b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml > index a3a1e5a65306..5ea10fe7ffe9 100644 > --- a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml > +++ b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml > @@ -421,6 +421,7 @@ patternProperties: > patternProperties: > "^event-(prox|touch)$": > type: object > + $ref: input.yaml# > description: > Represents a proximity or touch event reported by the > channel. > > @@ -467,11 +468,7 @@ patternProperties: > The IQS7222B does not feature channel-specific > timeouts; the time- > out specified for any one channel applies to all > channels. > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: > - Numeric key or switch code associated with the event. > Specify > - KEY_RESERVED (0) to opt out of event reporting. > + linux,code: true > > linux,input-type: > $ref: /schemas/types.yaml#/definitions/uint32 > diff --git a/Documentation/devicetree/bindings/input/gpio-keys.yaml > b/Documentation/devicetree/bindings/input/gpio-keys.yaml > index 7fe1966ea28a..cd07107fd5ed 100644 > --- a/Documentation/devicetree/bindings/input/gpio-keys.yaml > +++ b/Documentation/devicetree/bindings/input/gpio-keys.yaml > @@ -34,7 +34,6 @@ patternProperties: > > linux,code: > description: Key / Axis code to emit. > - $ref: /schemas/types.yaml#/definitions/uint32 > > linux,input-type: > description: > diff --git a/Documentation/devicetree/bindings/input/input.yaml > b/Documentation/devicetree/bindings/input/input.yaml > index 43d2f299c332..e3701a0bc500 100644 > --- a/Documentation/devicetree/bindings/input/input.yaml > +++ b/Documentation/devicetree/bindings/input/input.yaml > @@ -23,6 +23,14 @@ properties: > minimum: 0 > maximum: 0x2ff > > + linux,code: > + description: > + Specifies a single numeric keycode value to be used for > reporting > + button/switch events. Specify KEY_RESERVED (0) to opt out of > event > + reporting. > + $ref: /schemas/types.yaml#/definitions/uint32 > + maximum: 0x2ff > + > poll-interval: > description: Poll interval time in milliseconds. > $ref: /schemas/types.yaml#/definitions/uint32 > diff --git a/Documentation/devicetree/bindings/input/iqs269a.yaml > b/Documentation/devicetree/bindings/input/iqs269a.yaml > index 9c154e5e1a91..c22f8f27913a 100644 > --- a/Documentation/devicetree/bindings/input/iqs269a.yaml > +++ b/Documentation/devicetree/bindings/input/iqs269a.yaml > @@ -370,6 +370,7 @@ patternProperties: > patternProperties: > "^event-prox(-alt)?$": > type: object > + $ref: input.yaml# > description: > Represents a proximity event reported by the channel in > response to > a decrease in counts. Node names suffixed with '-alt' > instead corre- > @@ -396,14 +397,13 @@ patternProperties: > default: 10 > description: Specifies the threshold for the event. > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric key or switch code associated with > the event. > + linux,code: true > > additionalProperties: false > > "^event-touch(-alt)?$": > type: object > + $ref: input.yaml# > description: Represents a touch event reported by the channel. > > properties: > @@ -421,14 +421,13 @@ patternProperties: > default: 4 > description: Specifies the hysteresis for the event. > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric key or switch code associated with > the event. > + linux,code: true > > additionalProperties: false > > "^event-deep(-alt)?$": > type: object > + $ref: input.yaml# > description: Represents a deep-touch event reported by the > channel. > > properties: > @@ -446,9 +445,7 @@ patternProperties: > default: 0 > description: Specifies the hysteresis for the event. > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric key or switch code associated with > the event. > + linux,code: true > > additionalProperties: false > > diff --git a/Documentation/devicetree/bindings/input/iqs626a.yaml > b/Documentation/devicetree/bindings/input/iqs626a.yaml > index 0cb736c541c9..e645521da8ba 100644 > --- a/Documentation/devicetree/bindings/input/iqs626a.yaml > +++ b/Documentation/devicetree/bindings/input/iqs626a.yaml > @@ -449,6 +449,7 @@ patternProperties: > patternProperties: > "^event-(prox|touch|deep)(-alt)?$": > type: object > + $ref: input.yaml# > description: > Represents a proximity, touch or deep-touch event reported > by the > channel in response to a decrease in counts. Node names > suffixed with > @@ -487,9 +488,7 @@ patternProperties: > Specifies the hysteresis for the event (touch and > deep-touch > events only). > > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric key or switch code associated with > the event. > + linux,code: true > > linux,input-type: > $ref: /schemas/types.yaml#/definitions/uint32 > diff --git a/Documentation/devicetree/bindings/input/iqs62x-keys.yaml > b/Documentation/devicetree/bindings/input/iqs62x-keys.yaml > index 77fe3b545b35..e677e31fe8fe 100644 > --- a/Documentation/devicetree/bindings/input/iqs62x-keys.yaml > +++ b/Documentation/devicetree/bindings/input/iqs62x-keys.yaml > @@ -89,15 +89,14 @@ properties: > patternProperties: > "^hall-switch-(north|south)$": > type: object > + $ref: input.yaml# > description: > Represents north/south-field Hall-effect sensor touch or > proximity > events. Note that north/south-field orientation is reversed on > the > IQS620AXzCSR device due to its flip-chip package. > > properties: > - linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: Numeric switch code associated with the event. > + linux,code: true > > azoteq,use-prox: > $ref: /schemas/types.yaml#/definitions/flag > diff --git > a/Documentation/devicetree/bindings/input/max77650-onkey.yaml > b/Documentation/devicetree/bindings/input/max77650-onkey.yaml > index 3a2ad6ec64db..48edc0c8c1dd 100644 > --- a/Documentation/devicetree/bindings/input/max77650-onkey.yaml > +++ b/Documentation/devicetree/bindings/input/max77650-onkey.yaml > @@ -16,15 +16,15 @@ description: | > The onkey controller is represented as a sub-node of the PMIC node > on > the device tree. > > +allOf: > + - $ref: input.yaml# > + > properties: > compatible: > const: maxim,max77650-onkey > > linux,code: > - $ref: /schemas/types.yaml#/definitions/uint32 > - description: > - The key-code to be reported when the key is pressed. Defaults > - to KEY_POWER. > + default: 116 # KEY_POWER > > maxim,onkey-slide: > $ref: /schemas/types.yaml#/definitions/flag
On 6/8/22 4:12 PM, Rob Herring wrote: > Multiple bindings use 'linux,code', but there is not a central > definition and type. Add 'linux,code' to input.yaml and update all the > users to use it. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../devicetree/bindings/input/adc-joystick.yaml | 2 +- > .../input/allwinner,sun4i-a10-lradc-keys.yaml | 5 ++--- For allwinner,sun4i-a10-lradc-keys.yaml: Acked-by: Samuel Holland <samuel@sholland.org> > .../devicetree/bindings/input/azoteq,iqs7222.yaml | 7 ++----- > .../devicetree/bindings/input/gpio-keys.yaml | 1 - > .../devicetree/bindings/input/input.yaml | 8 ++++++++ > .../devicetree/bindings/input/iqs269a.yaml | 15 ++++++--------- > .../devicetree/bindings/input/iqs626a.yaml | 5 ++--- > .../devicetree/bindings/input/iqs62x-keys.yaml | 5 ++--- > .../devicetree/bindings/input/max77650-onkey.yaml | 8 ++++---- > 9 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/Documentation/devicetree/bindings/input/adc-joystick.yaml b/Documentation/devicetree/bindings/input/adc-joystick.yaml index 2ee04e03bc22..64d961458ac7 100644 --- a/Documentation/devicetree/bindings/input/adc-joystick.yaml +++ b/Documentation/devicetree/bindings/input/adc-joystick.yaml @@ -45,6 +45,7 @@ additionalProperties: false patternProperties: "^axis@[0-9a-f]+$": type: object + $ref: input.yaml# description: > Represents a joystick axis bound to the given ADC channel. For each entry in the io-channels list, one axis subnode with a matching @@ -57,7 +58,6 @@ patternProperties: description: Index of an io-channels list entry bound to this axis. linux,code: - $ref: /schemas/types.yaml#/definitions/uint32 description: EV_ABS specific event code generated by the axis. abs-range: diff --git a/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml b/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml index 3399fc288afb..9700dc468b25 100644 --- a/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml +++ b/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml @@ -44,14 +44,13 @@ properties: patternProperties: "^button-[0-9]+$": type: object + $ref: input.yaml# properties: label: $ref: /schemas/types.yaml#/definitions/string description: Descriptive name of the key - linux,code: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Keycode to emit + linux,code: true channel: $ref: /schemas/types.yaml#/definitions/uint32 diff --git a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml index a3a1e5a65306..5ea10fe7ffe9 100644 --- a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml +++ b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml @@ -421,6 +421,7 @@ patternProperties: patternProperties: "^event-(prox|touch)$": type: object + $ref: input.yaml# description: Represents a proximity or touch event reported by the channel. @@ -467,11 +468,7 @@ patternProperties: The IQS7222B does not feature channel-specific timeouts; the time- out specified for any one channel applies to all channels. - linux,code: - $ref: /schemas/types.yaml#/definitions/uint32 - description: - Numeric key or switch code associated with the event. Specify - KEY_RESERVED (0) to opt out of event reporting. + linux,code: true linux,input-type: $ref: /schemas/types.yaml#/definitions/uint32 diff --git a/Documentation/devicetree/bindings/input/gpio-keys.yaml b/Documentation/devicetree/bindings/input/gpio-keys.yaml index 7fe1966ea28a..cd07107fd5ed 100644 --- a/Documentation/devicetree/bindings/input/gpio-keys.yaml +++ b/Documentation/devicetree/bindings/input/gpio-keys.yaml @@ -34,7 +34,6 @@ patternProperties: linux,code: description: Key / Axis code to emit. - $ref: /schemas/types.yaml#/definitions/uint32 linux,input-type: description: diff --git a/Documentation/devicetree/bindings/input/input.yaml b/Documentation/devicetree/bindings/input/input.yaml index 43d2f299c332..e3701a0bc500 100644 --- a/Documentation/devicetree/bindings/input/input.yaml +++ b/Documentation/devicetree/bindings/input/input.yaml @@ -23,6 +23,14 @@ properties: minimum: 0 maximum: 0x2ff + linux,code: + description: + Specifies a single numeric keycode value to be used for reporting + button/switch events. Specify KEY_RESERVED (0) to opt out of event + reporting. + $ref: /schemas/types.yaml#/definitions/uint32 + maximum: 0x2ff + poll-interval: description: Poll interval time in milliseconds. $ref: /schemas/types.yaml#/definitions/uint32 diff --git a/Documentation/devicetree/bindings/input/iqs269a.yaml b/Documentation/devicetree/bindings/input/iqs269a.yaml index 9c154e5e1a91..c22f8f27913a 100644 --- a/Documentation/devicetree/bindings/input/iqs269a.yaml +++ b/Documentation/devicetree/bindings/input/iqs269a.yaml @@ -370,6 +370,7 @@ patternProperties: patternProperties: "^event-prox(-alt)?$": type: object + $ref: input.yaml# description: Represents a proximity event reported by the channel in response to a decrease in counts. Node names suffixed with '-alt' instead corre- @@ -396,14 +397,13 @@ patternProperties: default: 10 description: Specifies the threshold for the event. - linux,code: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Numeric key or switch code associated with the event. + linux,code: true additionalProperties: false "^event-touch(-alt)?$": type: object + $ref: input.yaml# description: Represents a touch event reported by the channel. properties: @@ -421,14 +421,13 @@ patternProperties: default: 4 description: Specifies the hysteresis for the event. - linux,code: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Numeric key or switch code associated with the event. + linux,code: true additionalProperties: false "^event-deep(-alt)?$": type: object + $ref: input.yaml# description: Represents a deep-touch event reported by the channel. properties: @@ -446,9 +445,7 @@ patternProperties: default: 0 description: Specifies the hysteresis for the event. - linux,code: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Numeric key or switch code associated with the event. + linux,code: true additionalProperties: false diff --git a/Documentation/devicetree/bindings/input/iqs626a.yaml b/Documentation/devicetree/bindings/input/iqs626a.yaml index 0cb736c541c9..e645521da8ba 100644 --- a/Documentation/devicetree/bindings/input/iqs626a.yaml +++ b/Documentation/devicetree/bindings/input/iqs626a.yaml @@ -449,6 +449,7 @@ patternProperties: patternProperties: "^event-(prox|touch|deep)(-alt)?$": type: object + $ref: input.yaml# description: Represents a proximity, touch or deep-touch event reported by the channel in response to a decrease in counts. Node names suffixed with @@ -487,9 +488,7 @@ patternProperties: Specifies the hysteresis for the event (touch and deep-touch events only). - linux,code: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Numeric key or switch code associated with the event. + linux,code: true linux,input-type: $ref: /schemas/types.yaml#/definitions/uint32 diff --git a/Documentation/devicetree/bindings/input/iqs62x-keys.yaml b/Documentation/devicetree/bindings/input/iqs62x-keys.yaml index 77fe3b545b35..e677e31fe8fe 100644 --- a/Documentation/devicetree/bindings/input/iqs62x-keys.yaml +++ b/Documentation/devicetree/bindings/input/iqs62x-keys.yaml @@ -89,15 +89,14 @@ properties: patternProperties: "^hall-switch-(north|south)$": type: object + $ref: input.yaml# description: Represents north/south-field Hall-effect sensor touch or proximity events. Note that north/south-field orientation is reversed on the IQS620AXzCSR device due to its flip-chip package. properties: - linux,code: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Numeric switch code associated with the event. + linux,code: true azoteq,use-prox: $ref: /schemas/types.yaml#/definitions/flag diff --git a/Documentation/devicetree/bindings/input/max77650-onkey.yaml b/Documentation/devicetree/bindings/input/max77650-onkey.yaml index 3a2ad6ec64db..48edc0c8c1dd 100644 --- a/Documentation/devicetree/bindings/input/max77650-onkey.yaml +++ b/Documentation/devicetree/bindings/input/max77650-onkey.yaml @@ -16,15 +16,15 @@ description: | The onkey controller is represented as a sub-node of the PMIC node on the device tree. +allOf: + - $ref: input.yaml# + properties: compatible: const: maxim,max77650-onkey linux,code: - $ref: /schemas/types.yaml#/definitions/uint32 - description: - The key-code to be reported when the key is pressed. Defaults - to KEY_POWER. + default: 116 # KEY_POWER maxim,onkey-slide: $ref: /schemas/types.yaml#/definitions/flag
Multiple bindings use 'linux,code', but there is not a central definition and type. Add 'linux,code' to input.yaml and update all the users to use it. Signed-off-by: Rob Herring <robh@kernel.org> --- .../devicetree/bindings/input/adc-joystick.yaml | 2 +- .../input/allwinner,sun4i-a10-lradc-keys.yaml | 5 ++--- .../devicetree/bindings/input/azoteq,iqs7222.yaml | 7 ++----- .../devicetree/bindings/input/gpio-keys.yaml | 1 - .../devicetree/bindings/input/input.yaml | 8 ++++++++ .../devicetree/bindings/input/iqs269a.yaml | 15 ++++++--------- .../devicetree/bindings/input/iqs626a.yaml | 5 ++--- .../devicetree/bindings/input/iqs62x-keys.yaml | 5 ++--- .../devicetree/bindings/input/max77650-onkey.yaml | 8 ++++---- 9 files changed, 27 insertions(+), 29 deletions(-)