2021-01-17 23:50:51

by Alistair Francis

[permalink] [raw]
Subject: [PATCH 1/3] devicetree/bindings: Initial commit of wacom,wacom-i2c

Signed-off-by: Alistair Francis <[email protected]>
---
.../input/touchscreen/wacom,wacom-i2c.yaml | 55 +++++++++++++++++++
.../devicetree/bindings/vendor-prefixes.yaml | 2 +
2 files changed, 57 insertions(+)
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml

diff --git a/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
new file mode 100644
index 000000000000..6b0e0034f836
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
@@ -0,0 +1,55 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/input/touchscreen/wacom,wacom-i2c.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Wacom I2C Controller
+
+maintainers:
+ - Alistair Francis <[email protected]>
+
+allOf:
+ - $ref: touchscreen.yaml#
+
+properties:
+ compatible:
+ const: wacom,wacom-i2c
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ flip-tilt-x:
+ flip-tilt-y:
+ flip-pos-x:
+ flip-pos-y:
+ flip-distance:
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+additionalProperties: false
+
+examples:
+ - |
+ #include "dt-bindings/interrupt-controller/irq.h"
+ i2c {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ digitiser@9 {
+ compatible = "wacom,wacom-i2c";
+ reg = <0x9>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
+ flip-tilt-x;
+ flip-tilt-y;
+ flip-pos-x;
+ flip-pos-y;
+ flip-distance;
+ };
+ };
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 041ae90b0d8f..5bca22f035a3 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -1202,6 +1202,8 @@ patternProperties:
description: Vision Optical Technology Co., Ltd.
"^vxt,.*":
description: VXT Ltd
+ "^wacom,.*":
+ description: Wacom Co., Ltd
"^wand,.*":
description: Wandbord (Technexion)
"^waveshare,.*":
--
2.29.2


2021-01-17 23:50:57

by Alistair Francis

[permalink] [raw]
Subject: [PATCH 3/3] arch/arm: reMarkable2: Enable wacom_i2c

Enable the wacom_i2c touchscreen for the reMarkable2.

Signed-off-by: Alistair Francis <[email protected]>
---
arch/arm/boot/dts/imx7d-remarkable2.dts | 41 +++++++++++++++++++++++++
1 file changed, 41 insertions(+)

diff --git a/arch/arm/boot/dts/imx7d-remarkable2.dts b/arch/arm/boot/dts/imx7d-remarkable2.dts
index fba55a0e028a..8052d884a5e5 100644
--- a/arch/arm/boot/dts/imx7d-remarkable2.dts
+++ b/arch/arm/boot/dts/imx7d-remarkable2.dts
@@ -150,6 +150,30 @@ &dma_apbh {
status = "disabled";
};

+&i2c1 {
+ clock-frequency = <400000>;
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&pinctrl_i2c1>;
+ pinctrl-1 = <&pinctrl_i2c1>;
+ status = "okay";
+
+ digitizer: wacom-i2c@9 {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&pinctrl_wacom>;
+ pinctrl-1 = <&pinctrl_wacom>;
+ compatible = "wacom,wacom-i2c";
+ reg = <0x09>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <1 2>;
+ flip-tilt-x;
+ flip-tilt-y;
+ flip-pos-x;
+ flip-pos-y;
+ flip-distance;
+ vdd-supply = <&reg_digitizer>;
+ };
+};
+
&sdma {
status = "okay";
};
@@ -221,6 +245,16 @@ &wdog1 {
};

&iomuxc_lpsr {
+ pinctrl_wacom: wacomgrp {
+ fsl,pins = <
+ /*MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x00000074 /* WACOM RESET */
+ MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x00000034 /* WACOM INT */
+ MX7D_PAD_LPSR_GPIO1_IO04__GPIO1_IO4 0x00000074 /* PDCTB */
+ /*MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x00000014 /* FWE */
+ /*MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6 0x00000014 /* WACOM PWR ENABLE */
+ >;
+ };
+
pinctrl_digitizer_reg: digitizerreggrp {
fsl,pins = <
/* DIGITIZER_PWR_EN */
@@ -236,6 +270,13 @@ MX7D_PAD_SAI1_RX_SYNC__GPIO6_IO16 0x59
>;
};

+ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
+ MX7D_PAD_I2C1_SDA__I2C1_SDA 0x4000007f
+ MX7D_PAD_I2C1_SCL__I2C1_SCL 0x4000007f
+ >;
+ };
+
pinctrl_uart1: uart1grp {
fsl,pins = <
MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX 0x79
--
2.29.2

2021-01-20 02:20:10

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: [PATCH 1/3] devicetree/bindings: Initial commit of wacom,wacom-i2c

Hi Alistair,

On Sat, Jan 16, 2021 at 08:24:26PM -0800, Alistair Francis wrote:
> Signed-off-by: Alistair Francis <[email protected]>
> ---
> .../input/touchscreen/wacom,wacom-i2c.yaml | 55 +++++++++++++++++++
> .../devicetree/bindings/vendor-prefixes.yaml | 2 +
> 2 files changed, 57 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
>
> diff --git a/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
> new file mode 100644
> index 000000000000..6b0e0034f836
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
> @@ -0,0 +1,55 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/input/touchscreen/wacom,wacom-i2c.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Wacom I2C Controller
> +
> +maintainers:
> + - Alistair Francis <[email protected]>
> +
> +allOf:
> + - $ref: touchscreen.yaml#
> +
> +properties:
> + compatible:
> + const: wacom,wacom-i2c
> +
> + reg:
> + maxItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + flip-tilt-x:
> + flip-tilt-y:

Does the device support tilt? The driver does not, at least at the
moment. Also, does it make sense to flip tilt but not position?

> + flip-pos-x:
> + flip-pos-y:

This needs to use standard touchscreen properties. See
Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml

> + flip-distance:

I am having trouble understanding when this one would be useful.

> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include "dt-bindings/interrupt-controller/irq.h"
> + i2c {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + digitiser@9 {
> + compatible = "wacom,wacom-i2c";
> + reg = <0x9>;
> + interrupt-parent = <&gpio1>;
> + interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
> + flip-tilt-x;
> + flip-tilt-y;
> + flip-pos-x;
> + flip-pos-y;
> + flip-distance;
> + };
> + };
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 041ae90b0d8f..5bca22f035a3 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@ -1202,6 +1202,8 @@ patternProperties:
> description: Vision Optical Technology Co., Ltd.
> "^vxt,.*":
> description: VXT Ltd
> + "^wacom,.*":
> + description: Wacom Co., Ltd
> "^wand,.*":
> description: Wandbord (Technexion)
> "^waveshare,.*":
> --
> 2.29.2
>

Thanks.

--
Dmitry

2021-01-20 06:38:24

by Alistair Francis

[permalink] [raw]
Subject: Re: [PATCH 1/3] devicetree/bindings: Initial commit of wacom,wacom-i2c

On Tue, Jan 19, 2021 at 6:15 PM Dmitry Torokhov
<[email protected]> wrote:
>
> Hi Alistair,
>
> On Sat, Jan 16, 2021 at 08:24:26PM -0800, Alistair Francis wrote:
> > Signed-off-by: Alistair Francis <[email protected]>
> > ---
> > .../input/touchscreen/wacom,wacom-i2c.yaml | 55 +++++++++++++++++++
> > .../devicetree/bindings/vendor-prefixes.yaml | 2 +
> > 2 files changed, 57 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
> >
> > diff --git a/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
> > new file mode 100644
> > index 000000000000..6b0e0034f836
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
> > @@ -0,0 +1,55 @@
> > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/input/touchscreen/wacom,wacom-i2c.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: Wacom I2C Controller
> > +
> > +maintainers:
> > + - Alistair Francis <[email protected]>
> > +
> > +allOf:
> > + - $ref: touchscreen.yaml#
> > +
> > +properties:
> > + compatible:
> > + const: wacom,wacom-i2c
> > +
> > + reg:
> > + maxItems: 1
> > +
> > + interrupts:
> > + maxItems: 1
> > +
> > + flip-tilt-x:
> > + flip-tilt-y:
>
> Does the device support tilt? The driver does not, at least at the
> moment. Also, does it make sense to flip tilt but not position?
>
> > + flip-pos-x:
> > + flip-pos-y:
>
> This needs to use standard touchscreen properties. See
> Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml
>
> > + flip-distance:
>
> I am having trouble understanding when this one would be useful.

Thanks for the review. These came from the original out of tree DT. I
have removed them, I'm planning on using the standard touchscreen ones
you pointed out if they are required.

Alistair

>
> > +
> > +required:
> > + - compatible
> > + - reg
> > + - interrupts
> > +
> > +additionalProperties: false
> > +
> > +examples:
> > + - |
> > + #include "dt-bindings/interrupt-controller/irq.h"
> > + i2c {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + digitiser@9 {
> > + compatible = "wacom,wacom-i2c";
> > + reg = <0x9>;
> > + interrupt-parent = <&gpio1>;
> > + interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
> > + flip-tilt-x;
> > + flip-tilt-y;
> > + flip-pos-x;
> > + flip-pos-y;
> > + flip-distance;
> > + };
> > + };
> > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > index 041ae90b0d8f..5bca22f035a3 100644
> > --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > @@ -1202,6 +1202,8 @@ patternProperties:
> > description: Vision Optical Technology Co., Ltd.
> > "^vxt,.*":
> > description: VXT Ltd
> > + "^wacom,.*":
> > + description: Wacom Co., Ltd
> > "^wand,.*":
> > description: Wandbord (Technexion)
> > "^waveshare,.*":
> > --
> > 2.29.2
> >
>
> Thanks.
>
> --
> Dmitry