diff mbox series

[v3,1/5] dt-bindings: input: Add common input binding in json-schema

Message ID 1570083176-8231-2-git-send-email-michal.vokac@ysoft.com (mailing list archive)
State Accepted
Commit 7cef1079e3ad0403bf9a2bb67228044efdded6c8
Headers show
Series Add polling mode to the MPR121 touchkey | expand

Commit Message

Michal Vokáč Oct. 3, 2019, 6:12 a.m. UTC 
Create schema for the common input properties and merge all properties
from the Documentation/devicetree/bindings/input/keys.txt binding into
this common schema.

Signed-off-by: Michal Vokáč <michal.vokac@ysoft.com>
---
Changes since v2:
 - Merge content of keys.txt binding inti this schema.

Changes since v1:
 - New patch in the series.

 Documentation/devicetree/bindings/input/input.yaml | 32 ++++++++++++++++++++++
 Documentation/devicetree/bindings/input/keys.txt   |  8 ------
 .../devicetree/bindings/input/mtk-pmic-keys.txt    |  4 +--
 .../devicetree/bindings/input/st,stpmic1-onkey.txt |  2 +-
 4 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/input.yaml
 delete mode 100644 Documentation/devicetree/bindings/input/keys.txt

Comments

Rob Herring (Arm) Oct. 10, 2019, 7:35 p.m. UTC | #1 
On Thu,  3 Oct 2019 08:12:52 +0200, =?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?= wrote:
> Create schema for the common input properties and merge all properties
> from the Documentation/devicetree/bindings/input/keys.txt binding into
> this common schema.
> 
> Signed-off-by: Michal Vokáč <michal.vokac@ysoft.com>
> ---
> Changes since v2:
>  - Merge content of keys.txt binding inti this schema.
> 
> Changes since v1:
>  - New patch in the series.
> 
>  Documentation/devicetree/bindings/input/input.yaml | 32 ++++++++++++++++++++++
>  Documentation/devicetree/bindings/input/keys.txt   |  8 ------
>  .../devicetree/bindings/input/mtk-pmic-keys.txt    |  4 +--
>  .../devicetree/bindings/input/st,stpmic1-onkey.txt |  2 +-
>  4 files changed, 35 insertions(+), 11 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/input/input.yaml
>  delete mode 100644 Documentation/devicetree/bindings/input/keys.txt
> 

Reviewed-by: Rob Herring <robh@kernel.org>
Dmitry Torokhov Oct. 16, 2019, 12:23 a.m. UTC | #2 
On Thu, Oct 10, 2019 at 02:35:37PM -0500, Rob Herring wrote:
> On Thu,  3 Oct 2019 08:12:52 +0200, =?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?= wrote:
> > Create schema for the common input properties and merge all properties
> > from the Documentation/devicetree/bindings/input/keys.txt binding into
> > this common schema.
> > 
> > Signed-off-by: Michal Vokáč <michal.vokac@ysoft.com>
> > ---
> > Changes since v2:
> >  - Merge content of keys.txt binding inti this schema.
> > 
> > Changes since v1:
> >  - New patch in the series.
> > 
> >  Documentation/devicetree/bindings/input/input.yaml | 32 ++++++++++++++++++++++
> >  Documentation/devicetree/bindings/input/keys.txt   |  8 ------
> >  .../devicetree/bindings/input/mtk-pmic-keys.txt    |  4 +--
> >  .../devicetree/bindings/input/st,stpmic1-onkey.txt |  2 +-
> >  4 files changed, 35 insertions(+), 11 deletions(-)
> >  create mode 100644 Documentation/devicetree/bindings/input/input.yaml
> >  delete mode 100644 Documentation/devicetree/bindings/input/keys.txt
> > 
> 
> Reviewed-by: Rob Herring <robh@kernel.org>

Applied, thank you.
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/input/input.yaml b/Documentation/devicetree/bindings/input/input.yaml
new file mode 100644
index 000000000000..ca8fe84a2e62
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/input.yaml
@@ -0,0 +1,32 @@ 
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/input/input.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Common input schema binding
+
+maintainers:
+  - Dmitry Torokhov <dmitry.torokhov@gmail.com>
+
+properties:
+  autorepeat:
+    description: Enable autorepeat when key is pressed and held down.
+    type: boolean
+
+  linux,keycodes:
+    description:
+      Specifies an array of numeric keycode values to be used for reporting
+      button presses.
+    allOf:
+      - $ref: /schemas/types.yaml#/definitions/uint32-array
+      - items:
+          minimum: 0
+          maximum: 0xff
+
+  power-off-time-sec:
+    description:
+      Duration in seconds which the key should be kept pressed for device to
+      power off automatically. Device with key pressed shutdown feature can
+      specify this property.
+    $ref: /schemas/types.yaml#/definitions/uint32
diff --git a/Documentation/devicetree/bindings/input/keys.txt b/Documentation/devicetree/bindings/input/keys.txt
deleted file mode 100644
index f5a5ddde53f1..000000000000
--- a/Documentation/devicetree/bindings/input/keys.txt
+++ /dev/null
@@ -1,8 +0,0 @@ 
-General Keys Properties:
-
-Optional properties for Keys:
-- power-off-time-sec: Duration in seconds which the key should be kept
-	pressed for device to power off automatically. Device with key pressed
-	shutdown feature can specify this property.
-- linux,keycodes: Specifies the numeric keycode values to be used for
-	reporting key presses.
diff --git a/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt
index 2888d07c2ef0..535d92885372 100644
--- a/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt
+++ b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt
@@ -10,13 +10,13 @@  Documentation/devicetree/bindings/mfd/mt6397.txt
 
 Required properties:
 - compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys"
-- linux,keycodes: See Documentation/devicetree/bindings/input/keys.txt
+- linux,keycodes: See Documentation/devicetree/bindings/input/input.yaml
 
 Optional Properties:
 - wakeup-source: See Documentation/devicetree/bindings/power/wakeup-source.txt
 - mediatek,long-press-mode: Long press key shutdown setting, 1 for
 	pwrkey only, 2 for pwrkey/homekey together, others for disabled.
-- power-off-time-sec: See Documentation/devicetree/bindings/input/keys.txt
+- power-off-time-sec: See Documentation/devicetree/bindings/input/input.yaml
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/input/st,stpmic1-onkey.txt b/Documentation/devicetree/bindings/input/st,stpmic1-onkey.txt
index 4494613ae7ad..eb8e83736c02 100644
--- a/Documentation/devicetree/bindings/input/st,stpmic1-onkey.txt
+++ b/Documentation/devicetree/bindings/input/st,stpmic1-onkey.txt
@@ -15,7 +15,7 @@  Optional properties:
 - st,onkey-pu-inactive: onkey pull up is not active
 - power-off-time-sec: Duration in seconds which the key should be kept
         pressed for device to power off automatically (from 1 to 16 seconds).
-        see See Documentation/devicetree/bindings/input/keys.txt
+        see See Documentation/devicetree/bindings/input/input.yaml
 
 Example: