diff mbox series

[v2,4/5] dt-bindings: input: Centralize 'linux,input-type' definition

Message ID 20220608211207.2058487-5-robh@kernel.org
State Accepted
Commit 75448ff73f5ecfdfa867cbd0bd2cecc71f950978
Headers show
Series dt-bindings: input: Common property clean-ups and adc-keys conversion | expand

Commit Message

Rob Herring (Arm) June 8, 2022, 9:12 p.m. UTC
Multiple bindings use 'linux,input-type', but there is not a central
definition and type. Add 'linux,input-type' to input.yaml and update all
the users to use it.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 .../devicetree/bindings/input/azoteq,iqs7222.yaml  |  1 -
 .../devicetree/bindings/input/gpio-keys.yaml       |  7 +------
 Documentation/devicetree/bindings/input/input.yaml | 14 ++++++++++++++
 .../devicetree/bindings/input/iqs626a.yaml         |  4 ----
 4 files changed, 15 insertions(+), 11 deletions(-)

Comments

Jeff LaBundy June 9, 2022, 1:38 a.m. UTC | #1
Hi Rob,

On Wed, Jun 08, 2022 at 03:12:06PM -0600, Rob Herring wrote:
> Multiple bindings use 'linux,input-type', but there is not a central
> definition and type. Add 'linux,input-type' 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/azoteq,iqs7222.yaml  |  1 -
>  .../devicetree/bindings/input/gpio-keys.yaml       |  7 +------
>  Documentation/devicetree/bindings/input/input.yaml | 14 ++++++++++++++
>  .../devicetree/bindings/input/iqs626a.yaml         |  4 ----
>  4 files changed, 15 insertions(+), 11 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml
> index 5ea10fe7ffe9..a13bd3e41dd3 100644
> --- a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml
> +++ b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml
> @@ -471,7 +471,6 @@ patternProperties:
>            linux,code: true
>  
>            linux,input-type:
> -            $ref: /schemas/types.yaml#/definitions/uint32
>              enum: [1, 5]
>              default: 1
>              description:
> diff --git a/Documentation/devicetree/bindings/input/gpio-keys.yaml b/Documentation/devicetree/bindings/input/gpio-keys.yaml
> index cd07107fd5ed..6b49b1afdd95 100644
> --- a/Documentation/devicetree/bindings/input/gpio-keys.yaml
> +++ b/Documentation/devicetree/bindings/input/gpio-keys.yaml
> @@ -36,12 +36,7 @@ patternProperties:
>            description: Key / Axis code to emit.
>  
>          linux,input-type:
> -          description:
> -            Specify event type this button/key generates. If not specified defaults to
> -            <1> == EV_KEY.
> -          $ref: /schemas/types.yaml#/definitions/uint32
> -
> -          default: 1
> +          default: 1  # EV_KEY
>  
>          linux,input-value:
>            description: |
> diff --git a/Documentation/devicetree/bindings/input/input.yaml b/Documentation/devicetree/bindings/input/input.yaml
> index e3701a0bc500..17512f4347fd 100644
> --- a/Documentation/devicetree/bindings/input/input.yaml
> +++ b/Documentation/devicetree/bindings/input/input.yaml
> @@ -31,6 +31,17 @@ properties:
>      $ref: /schemas/types.yaml#/definitions/uint32
>      maximum: 0x2ff
>  
> +  linux,input-type:
> +    $ref: /schemas/types.yaml#/definitions/uint32
> +    enum:
> +      - 1   # EV_KEY
> +      - 2   # EV_REL
> +      - 3   # EV_ABS
> +      - 5   # EV_SW
> +    description:
> +      Specifies whether the event is to be interpreted as a key, relative,
> +      absolute, or switch.
> +
>    poll-interval:
>      description: Poll interval time in milliseconds.
>      $ref: /schemas/types.yaml#/definitions/uint32
> @@ -47,4 +58,7 @@ properties:
>        reset automatically. Device with key pressed reset feature can specify
>        this property.
>  
> +dependencies:
> +  linux,input-type: [ "linux,code" ]
> +
>  additionalProperties: true
> diff --git a/Documentation/devicetree/bindings/input/iqs626a.yaml b/Documentation/devicetree/bindings/input/iqs626a.yaml
> index 008959f2d425..4df27646c980 100644
> --- a/Documentation/devicetree/bindings/input/iqs626a.yaml
> +++ b/Documentation/devicetree/bindings/input/iqs626a.yaml
> @@ -491,16 +491,12 @@ patternProperties:
>            linux,code: true
>  
>            linux,input-type:
> -            $ref: /schemas/types.yaml#/definitions/uint32
>              enum: [1, 5]
>              description:
>                Specifies whether the event is to be interpreted as a key (1) or
>                a switch (5). By default, Hall-channel events are interpreted as
>                switches and all others are interpreted as keys.
>  
> -        dependencies:
> -          linux,input-type: ["linux,code"]
> -
>          additionalProperties: false
>  
>      dependencies:
> -- 
> 2.34.1
> 

Kind regards,
Jeff LaBundy
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml
index 5ea10fe7ffe9..a13bd3e41dd3 100644
--- a/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml
+++ b/Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml
@@ -471,7 +471,6 @@  patternProperties:
           linux,code: true
 
           linux,input-type:
-            $ref: /schemas/types.yaml#/definitions/uint32
             enum: [1, 5]
             default: 1
             description:
diff --git a/Documentation/devicetree/bindings/input/gpio-keys.yaml b/Documentation/devicetree/bindings/input/gpio-keys.yaml
index cd07107fd5ed..6b49b1afdd95 100644
--- a/Documentation/devicetree/bindings/input/gpio-keys.yaml
+++ b/Documentation/devicetree/bindings/input/gpio-keys.yaml
@@ -36,12 +36,7 @@  patternProperties:
           description: Key / Axis code to emit.
 
         linux,input-type:
-          description:
-            Specify event type this button/key generates. If not specified defaults to
-            <1> == EV_KEY.
-          $ref: /schemas/types.yaml#/definitions/uint32
-
-          default: 1
+          default: 1  # EV_KEY
 
         linux,input-value:
           description: |
diff --git a/Documentation/devicetree/bindings/input/input.yaml b/Documentation/devicetree/bindings/input/input.yaml
index e3701a0bc500..17512f4347fd 100644
--- a/Documentation/devicetree/bindings/input/input.yaml
+++ b/Documentation/devicetree/bindings/input/input.yaml
@@ -31,6 +31,17 @@  properties:
     $ref: /schemas/types.yaml#/definitions/uint32
     maximum: 0x2ff
 
+  linux,input-type:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    enum:
+      - 1   # EV_KEY
+      - 2   # EV_REL
+      - 3   # EV_ABS
+      - 5   # EV_SW
+    description:
+      Specifies whether the event is to be interpreted as a key, relative,
+      absolute, or switch.
+
   poll-interval:
     description: Poll interval time in milliseconds.
     $ref: /schemas/types.yaml#/definitions/uint32
@@ -47,4 +58,7 @@  properties:
       reset automatically. Device with key pressed reset feature can specify
       this property.
 
+dependencies:
+  linux,input-type: [ "linux,code" ]
+
 additionalProperties: true
diff --git a/Documentation/devicetree/bindings/input/iqs626a.yaml b/Documentation/devicetree/bindings/input/iqs626a.yaml
index 008959f2d425..4df27646c980 100644
--- a/Documentation/devicetree/bindings/input/iqs626a.yaml
+++ b/Documentation/devicetree/bindings/input/iqs626a.yaml
@@ -491,16 +491,12 @@  patternProperties:
           linux,code: true
 
           linux,input-type:
-            $ref: /schemas/types.yaml#/definitions/uint32
             enum: [1, 5]
             description:
               Specifies whether the event is to be interpreted as a key (1) or
               a switch (5). By default, Hall-channel events are interpreted as
               switches and all others are interpreted as keys.
 
-        dependencies:
-          linux,input-type: ["linux,code"]
-
         additionalProperties: false
 
     dependencies: