Input: mms114 - Convert bindings to YAML and extend

Commit Message

Linus Walleij March 30, 2021, 8:12 p.m. UTC

This converts the Melfas MMS114 bindings and extend like this:

- Require nodename touchscreen@ (this seems to be the case for
  all in-tree DTS files)
- Add the mms134s and mms136 compatibles
- Add the avdd and vdd power supplies
- Define the I2C clock frequency property

Cc: [e-mail]
Cc: Stephan Gerhold <[e-mail]>
Cc: Simon Shields <[e-mail]>
Cc: Tomasz Figa <[e-mail]>
Signed-off-by: Linus Walleij <[e-mail]>
---
 .../input/touchscreen/melfas,mms114.yaml      | 87 +++++++++++++++++++
 .../bindings/input/touchscreen/mms114.txt     | 42 ---------
 2 files changed, 87 insertions(+), 42 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/melfas,mms114.yaml
 delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt

Comments

Rob Herring (Arm) April 9, 2021, 2:24 p.m. UTC | #1

On Tue, 30 Mar 2021 22:12:33 +0200, Linus Walleij wrote:
> This converts the Melfas MMS114 bindings and extend like this:
> 
> - Require nodename touchscreen@ (this seems to be the case for
>   all in-tree DTS files)
> - Add the mms134s and mms136 compatibles
> - Add the avdd and vdd power supplies
> - Define the I2C clock frequency property
> 
> Cc: [e-mail]
> Cc: Stephan Gerhold <[e-mail]>
> Cc: Simon Shields <[e-mail]>
> Cc: Tomasz Figa <[e-mail]>
> Signed-off-by: Linus Walleij <[e-mail]>
> ---
>  .../input/touchscreen/melfas,mms114.yaml      | 87 +++++++++++++++++++
>  .../bindings/input/touchscreen/mms114.txt     | 42 ---------
>  2 files changed, 87 insertions(+), 42 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/input/touchscreen/melfas,mms114.yaml
>  delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt
> 

Reviewed-by: Rob Herring <[e-mail]>

Dmitry Torokhov April 10, 2021, 6:05 a.m. UTC | #2

On Tue, Mar 30, 2021 at 10:12:33PM +0200, Linus Walleij wrote:
> This converts the Melfas MMS114 bindings and extend like this:
> 
> - Require nodename touchscreen@ (this seems to be the case for
>   all in-tree DTS files)
> - Add the mms134s and mms136 compatibles
> - Add the avdd and vdd power supplies
> - Define the I2C clock frequency property
> 
> Cc: [e-mail]
> Cc: Stephan Gerhold <[e-mail]>
> Cc: Simon Shields <[e-mail]>
> Cc: Tomasz Figa <[e-mail]>
> Signed-off-by: Linus Walleij <[e-mail]>

Applied, thank you.

Patch

diff --git a/Documentation/devicetree/bindings/input/touchscreen/melfas,mms114.yaml b/Documentation/devicetree/bindings/input/touchscreen/melfas,mms114.yaml
new file mode 100644
index 000000000000..62366886fb3e
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/touchscreen/melfas,mms114.yaml
@@ -0,0 +1,87 @@ 
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/input/touchscreen/melfas,mms114.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Melfas MMS114 family touchscreen controller bindings
+
+maintainers:
+  - Linus Walleij <[e-mail]>
+
+allOf:
+  - $ref: touchscreen.yaml#
+
+properties:
+  $nodename:
+    pattern: "^touchscreen(@.*)?$"
+
+  compatible:
+    items:
+      - enum:
+          - melfas,mms114
+          - melfas,mms134s
+          - melfas,mms136
+          - melfas,mms152
+          - melfas,mms345l
+
+  reg:
+    description: I2C address
+
+  clock-frequency:
+    description: I2C client clock frequency, defined for host
+    minimum: 100000
+    maximum: 400000
+
+  interrupts:
+    maxItems: 1
+
+  avdd-supply:
+    description: Analog power supply regulator on AVDD pin
+
+  vdd-supply:
+    description: Digital power supply regulator on VDD pin
+
+  touchscreen-size-x: true
+  touchscreen-size-y: true
+  touchscreen-fuzz-x: true
+  touchscreen-fuzz-y: true
+  touchscreen-fuzz-pressure: true
+  touchscreen-inverted-x: true
+  touchscreen-inverted-y: true
+  touchscreen-swapped-x-y: true
+  touchscreen-max-pressure: true
+
+additionalProperties: false
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - touchscreen-size-x
+  - touchscreen-size-y
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    i2c {
+      #address-cells = <1>;
+      #size-cells = <0>;
+      touchscreen@48 {
+        compatible = "melfas,mms114";
+        reg = <0x48>;
+        interrupt-parent = <&gpio>;
+        interrupts = <39 IRQ_TYPE_EDGE_FALLING>;
+        avdd-supply = <&ldo1_reg>;
+        vdd-supply = <&ldo2_reg>;
+        touchscreen-size-x = <720>;
+        touchscreen-size-y = <1280>;
+        touchscreen-fuzz-x = <10>;
+        touchscreen-fuzz-y = <10>;
+        touchscreen-fuzz-pressure = <10>;
+        touchscreen-inverted-x;
+        touchscreen-inverted-y;
+      };
+    };
+
+...
diff --git a/Documentation/devicetree/bindings/input/touchscreen/mms114.txt b/Documentation/devicetree/bindings/input/touchscreen/mms114.txt
deleted file mode 100644
index 707234cfd7e6..000000000000
--- a/Documentation/devicetree/bindings/input/touchscreen/mms114.txt
+++ /dev/null
@@ -1,42 +0,0 @@ 
-* MELFAS MMS114/MMS152/MMS345L touchscreen controller
-
-Required properties:
-- compatible: should be one of:
-	- "melfas,mms114"
-	- "melfas,mms152"
-	- "melfas,mms345l"
-- reg: I2C address of the chip
-- interrupts: interrupt to which the chip is connected
-- touchscreen-size-x: See [1]
-- touchscreen-size-y: See [1]
-
-Optional properties:
-- touchscreen-fuzz-x: See [1]
-- touchscreen-fuzz-y: See [1]
-- touchscreen-fuzz-pressure: See [1]
-- touchscreen-inverted-x: See [1]
-- touchscreen-inverted-y: See [1]
-- touchscreen-swapped-x-y: See [1]
-
-[1]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
-
-Example:
-
-	i2c@00000000 {
-		/* ... */
-
-		touchscreen@48 {
-			compatible = "melfas,mms114";
-			reg = <0x48>;
-			interrupts = <39 0>;
-			touchscreen-size-x = <720>;
-			touchscreen-size-y = <1280>;
-			touchscreen-fuzz-x = <10>;
-			touchscreen-fuzz-y = <10>;
-			touchscreen-fuzz-pressure = <10>;
-			touchscreen-inverted-x;
-			touchscreen-inverted-y;
-		};
-
-		/* ... */
-	};