From: Andreas Kemnade <andreas@kemnade.info>
Only some driver-specific properties were accepted, change it
to use the now-available standard properties which are
found in devicetrees containing this chip.
Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
---
drivers/input/touchscreen/tsc2007.h | 2 ++
drivers/input/touchscreen/tsc2007_core.c | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/input/touchscreen/tsc2007.h b/drivers/input/touchscreen/tsc2007.h
index 69b08dd6c8df1..e346fb4f75521 100644
--- a/drivers/input/touchscreen/tsc2007.h
+++ b/drivers/input/touchscreen/tsc2007.h
@@ -19,6 +19,7 @@
#ifndef _TSC2007_H
#define _TSC2007_H
+#include <linux/input/touchscreen.h>
struct gpio_desc;
#define TSC2007_MEASURE_TEMP0 (0x0 << 4)
@@ -63,6 +64,7 @@ struct tsc2007 {
struct i2c_client *client;
+ struct touchscreen_properties prop;
u16 model;
u16 x_plate_ohms;
u16 max_rt;
diff --git a/drivers/input/touchscreen/tsc2007_core.c b/drivers/input/touchscreen/tsc2007_core.c
index 8d832a372b897..5252301686ec6 100644
--- a/drivers/input/touchscreen/tsc2007_core.c
+++ b/drivers/input/touchscreen/tsc2007_core.c
@@ -142,8 +142,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle)
rt = ts->max_rt - rt;
input_report_key(input, BTN_TOUCH, 1);
- input_report_abs(input, ABS_X, tc.x);
- input_report_abs(input, ABS_Y, tc.y);
+ touchscreen_report_pos(input, &ts->prop, tc.x, tc.y, false);
input_report_abs(input, ABS_PRESSURE, rt);
input_sync(input);
@@ -339,9 +338,9 @@ static int tsc2007_probe(struct i2c_client *client)
input_set_drvdata(input_dev, ts);
input_set_capability(input_dev, EV_KEY, BTN_TOUCH);
-
input_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, ts->fuzzx, 0);
input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, ts->fuzzy, 0);
+ touchscreen_parse_properties(input_dev, false, &ts->prop);
input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_12BIT,
ts->fuzzz, 0);
--
2.39.2
On Thu, Dec 05, 2024 at 09:44:12PM +0100, akemnade@kernel.org wrote:
> From: Andreas Kemnade <andreas@kemnade.info>
>
> Only some driver-specific properties were accepted, change it
> to use the now-available standard properties which are
> found in devicetrees containing this chip.
>
> Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/input/touchscreen/tsc2007.h | 2 ++
> drivers/input/touchscreen/tsc2007_core.c | 5 ++---
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/touchscreen/tsc2007.h b/drivers/input/touchscreen/tsc2007.h
> index 69b08dd6c8df1..e346fb4f75521 100644
> --- a/drivers/input/touchscreen/tsc2007.h
> +++ b/drivers/input/touchscreen/tsc2007.h
> @@ -19,6 +19,7 @@
> #ifndef _TSC2007_H
> #define _TSC2007_H
>
> +#include <linux/input/touchscreen.h>
> struct gpio_desc;
>
> #define TSC2007_MEASURE_TEMP0 (0x0 << 4)
> @@ -63,6 +64,7 @@ struct tsc2007 {
>
> struct i2c_client *client;
>
> + struct touchscreen_properties prop;
> u16 model;
> u16 x_plate_ohms;
> u16 max_rt;
> diff --git a/drivers/input/touchscreen/tsc2007_core.c b/drivers/input/touchscreen/tsc2007_core.c
> index 8d832a372b897..5252301686ec6 100644
> --- a/drivers/input/touchscreen/tsc2007_core.c
> +++ b/drivers/input/touchscreen/tsc2007_core.c
> @@ -142,8 +142,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle)
> rt = ts->max_rt - rt;
>
> input_report_key(input, BTN_TOUCH, 1);
> - input_report_abs(input, ABS_X, tc.x);
> - input_report_abs(input, ABS_Y, tc.y);
> + touchscreen_report_pos(input, &ts->prop, tc.x, tc.y, false);
> input_report_abs(input, ABS_PRESSURE, rt);
>
> input_sync(input);
> @@ -339,9 +338,9 @@ static int tsc2007_probe(struct i2c_client *client)
> input_set_drvdata(input_dev, ts);
>
> input_set_capability(input_dev, EV_KEY, BTN_TOUCH);
> -
> input_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, ts->fuzzx, 0);
> input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, ts->fuzzy, 0);
> + touchscreen_parse_properties(input_dev, false, &ts->prop);
> input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_12BIT,
> ts->fuzzz, 0);
>
> --
> 2.39.2
>
--
Dmitry
Am Mon, 9 Dec 2024 09:52:11 -0800 schrieb Dmitry Torokhov <dmitry.torokhov@gmail.com>: > On Thu, Dec 05, 2024 at 09:44:12PM +0100, akemnade@kernel.org wrote: > > From: Andreas Kemnade <andreas@kemnade.info> > > > > Only some driver-specific properties were accepted, change it > > to use the now-available standard properties which are > > found in devicetrees containing this chip. > > > > Signed-off-by: Andreas Kemnade <andreas@kemnade.info> > > Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> this was in -next but somehow flipped through, so maybe apply it directly to input now? Regards, Andreas
© 2016 - 2025 Red Hat, Inc.