Re: [PATCHv1 1/2] Input: EXC3000: add EXC80Hxx support
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2019-11-13 00:19:47
Also in:
lkml
On Thu, Nov 07, 2019 at 07:10:09PM +0100, Sebastian Reichel wrote:
quoted hunk ↗ jump to hunk
This adds support for EXC80Hxx controllers, which uses a different event type id and has two extra bits for the resolution (so the maximum is 16384 instead of 4096). The patch has been tested with EXC80H60 and EXC80H84. Signed-off-by: Sebastian Reichel <redacted> --- .../bindings/input/touchscreen/exc3000.txt | 6 ++-- drivers/input/touchscreen/exc3000.c | 34 ++++++++++++++----- 2 files changed, 30 insertions(+), 10 deletions(-)diff --git a/Documentation/devicetree/bindings/input/touchscreen/exc3000.txt b/Documentation/devicetree/bindings/input/touchscreen/exc3000.txt index 68291b94fec2..057b680f0420 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/exc3000.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/exc3000.txt@@ -1,7 +1,9 @@ -* EETI EXC3000 Multiple Touch Controller +* EETI EXC3000 and EXC80Hxx Multiple Touch Controller Required properties: -- compatible: must be "eeti,exc3000" +- compatible: must be one of + * "eeti,exc3000" + * "eeti,exc80hxx"
Rob is saying "no wildcard compatibles"... If both chips are the same from software POV we should use "eeti,exc80h60".
quoted hunk ↗ jump to hunk
- reg: i2c slave address - interrupts: touch controller interrupt - touchscreen-size-x: See touchscreen.txtdiff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c index e007e2e8f626..7d695022082c 100644 --- a/drivers/input/touchscreen/exc3000.c +++ b/drivers/input/touchscreen/exc3000.c@@ -23,11 +23,20 @@ #define EXC3000_SLOTS_PER_FRAME 5 #define EXC3000_LEN_FRAME 66 #define EXC3000_LEN_POINT 10 -#define EXC3000_MT_EVENT 6 + +#define EXC3000_MT1_EVENT 0x06 +#define EXC3000_MT2_EVENT 0x18 + #define EXC3000_TIMEOUT_MS 100 +enum exc3000_device_type { + EETI_EXC3000, + EETI_EXC80Hxx +}; + struct exc3000_data { struct i2c_client *client; + enum exc3000_device_type type; struct input_dev *input; struct touchscreen_properties prop; struct timer_list timer;@@ -76,8 +85,10 @@ static int exc3000_read_frame(struct i2c_client *client, u8 *buf) if (ret != EXC3000_LEN_FRAME) return -EIO; - if (get_unaligned_le16(buf) != EXC3000_LEN_FRAME || - buf[2] != EXC3000_MT_EVENT) + if (get_unaligned_le16(buf) != EXC3000_LEN_FRAME) + return -EINVAL; + + if (buf[2] != EXC3000_MT1_EVENT && buf[2] != EXC3000_MT2_EVENT) return -EINVAL; return 0;@@ -157,6 +168,7 @@ static int exc3000_probe(struct i2c_client *client, return -ENOMEM; data->client = client; + data->type = id->driver_data; timer_setup(&data->timer, exc3000_timer, 0); input = devm_input_allocate_device(&client->dev);@@ -168,8 +180,13 @@ static int exc3000_probe(struct i2c_client *client, input->name = "EETI EXC3000 Touch Screen"; input->id.bustype = BUS_I2C; - input_set_abs_params(input, ABS_MT_POSITION_X, 0, 4095, 0, 0); - input_set_abs_params(input, ABS_MT_POSITION_Y, 0, 4095, 0, 0); + if (data->type == EETI_EXC80Hxx) {
I'd say max_xy = (data->type == EETI_EXC80Hxx ? SZ_16K : SZ_4K) - 1;
quoted hunk ↗ jump to hunk
+ input_set_abs_params(input, ABS_MT_POSITION_X, 0, 16383, 0, 0); + input_set_abs_params(input, ABS_MT_POSITION_Y, 0, 16383, 0, 0); + } else { + input_set_abs_params(input, ABS_MT_POSITION_X, 0, 4095, 0, 0); + input_set_abs_params(input, ABS_MT_POSITION_Y, 0, 4095, 0, 0); + } touchscreen_parse_properties(input, true, &data->prop); error = input_mt_init_slots(input, EXC3000_NUM_SLOTS,@@ -191,14 +208,15 @@ static int exc3000_probe(struct i2c_client *client, } static const struct i2c_device_id exc3000_id[] = { - { "exc3000", 0 }, - { } + { "exc3000", EETI_EXC3000 }, + { "exc80hxx", EETI_EXC80Hxx } }; MODULE_DEVICE_TABLE(i2c, exc3000_id); #ifdef CONFIG_OF static const struct of_device_id exc3000_of_match[] = { - { .compatible = "eeti,exc3000" }, + { .compatible = "eeti,exc3000", .data = (const void*) EETI_EXC3000 }, + { .compatible = "eeti,exc80hxx", .data = (const void*) EETI_EXC80Hxx }, { } }; MODULE_DEVICE_TABLE(of, exc3000_of_match);-- 2.24.0.rc1
Thanks. -- Dmitry