lkml.org 
[lkml]   [2021]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/6] input/touchscreen: Add device tree support to wacom_i2c
    Date
    Allow the wacom-i2c device to be exposed via device tree.

    Signed-off-by: Alistair Francis <alistair@alistair23.me>
    ---
    .../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
    +
    required:
    - compatible
    - reg
    @@ -40,5 +43,6 @@ examples:
    reg = <0x9>;
    interrupt-parent = <&gpio1>;
    interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
    + vdd-supply = <&reg_touch>;
    };
    };
    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>
    #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);
    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);
    +
    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
    +static const struct of_device_id wacom_i2c_of_match_table[] = {
    + { .compatible = "wacom,wacom-i2c" },
    + {}
    +};
    +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
    },

    .probe = wacom_i2c_probe,
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-01-21 08:55    [W:6.615 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site