Re: [PATCH v2 2/6] input/touchscreen: Add device tree support to wacom_i2c

[Marco Felsch]

On 21-01-20 22:56, Alistair Francis wrote:
> Allow the wacom-i2c device to be exposed via device tree.

You did a lot more than exposing.

> Signed-off-by: Alistair Francis <alistair@xxxxxxxxxxxxx>
> ---
>  .../input/touchscreen/wacom,wacom-i2c.yaml       |  4 ++++
>  drivers/input/touchscreen/wacom_i2c.c            | 16 ++++++++++++++++
>  2 files changed, 20 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
> index b36d22cd20a2..06ad5ee561af 100644
> --- a/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
> +++ b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
> @@ -22,6 +22,9 @@ properties:
>    interrupts:
>      maxItems: 1
>  
> +  vdd-supply:
> +    maxItems: 1
> +

Unrelated change.

>  required:
>    - compatible
>    - reg
> @@ -40,5 +43,6 @@ examples:
>                  reg = <0x9>;
>                  interrupt-parent = <&gpio1>;
>                  interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
> +                vdd-supply = <&reg_touch>;

Dito.

>          };
>      };
> diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
> index 1afc6bde2891..ec6e0aff8deb 100644
> --- a/drivers/input/touchscreen/wacom_i2c.c
> +++ b/drivers/input/touchscreen/wacom_i2c.c
> @@ -11,7 +11,9 @@
>  #include <linux/i2c.h>
>  #include <linux/slab.h>
>  #include <linux/irq.h>
> +#include <linux/input/touchscreen.h>

Unrelated change.

>  #include <linux/interrupt.h>
> +#include <linux/of.h>
>  #include <asm/unaligned.h>
>  
>  #define WACOM_CMD_QUERY0	0x04
> @@ -32,6 +34,7 @@ struct wacom_features {
>  struct wacom_i2c {
>  	struct i2c_client *client;
>  	struct input_dev *input;
> +	struct touchscreen_properties props;
>  	u8 data[WACOM_QUERY_SIZE];
>  	bool prox;
>  	int tool;
> @@ -187,6 +190,7 @@ static int wacom_i2c_probe(struct i2c_client *client,
>  	__set_bit(BTN_STYLUS2, input->keybit);
>  	__set_bit(BTN_TOUCH, input->keybit);
>  
> +	touchscreen_parse_properties(input, true, &wac_i2c->props);

Unrelated change, please move it into a sepreate patch.

>  	input_set_abs_params(input, ABS_X, 0, features.x_max, 0, 0);
>  	input_set_abs_params(input, ABS_Y, 0, features.y_max, 0, 0);
>  	input_set_abs_params(input, ABS_PRESSURE,
> @@ -214,6 +218,7 @@ static int wacom_i2c_probe(struct i2c_client *client,
>  	}
>  
>  	i2c_set_clientdata(client, wac_i2c);
> +

Unrelated change.

>  	return 0;
>  
>  err_free_irq:
> @@ -262,10 +267,21 @@ static const struct i2c_device_id wacom_i2c_id[] = {
>  };
>  MODULE_DEVICE_TABLE(i2c, wacom_i2c_id);
>  
> +#ifdef CONFIG_OF

This #ifdef can be removed using the __maybe_unused macro.

> +static const struct of_device_id wacom_i2c_of_match_table[] = {
> +	{ .compatible = "wacom,wacom-i2c" },

IMHO "wacom,wacom-i2c" is not good maybe:
 - "wacom,generic" if you don't know the device, or
 - "wacom,XYZ" where XYZ belongs to the real device name.

> +	{}
> +};
> +MODULE_DEVICE_TABLE(of, wacom_i2c_of_match_table);
> +#endif
> +
>  static struct i2c_driver wacom_i2c_driver = {
>  	.driver	= {
>  		.name	= "wacom_i2c",
>  		.pm	= &wacom_i2c_pm,
> +#ifdef CONFIG_OF
> +		.of_match_table = of_match_ptr(wacom_i2c_of_match_table),
> +#endif

No need for this #ifdef.

Regards,
  Marco


>  	},
>  
>  	.probe		= wacom_i2c_probe,
> -- 
> 2.29.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |