* [PATCH v3] Input: atmel_mxt_ts - Report pressure information from the driver
@ 2011-08-15 15:02 Yufeng Shen
2011-08-16 0:22 ` Wanlong Gao
2011-08-16 5:27 ` Henrik Rydberg
0 siblings, 2 replies; 6+ messages in thread
From: Yufeng Shen @ 2011-08-15 15:02 UTC (permalink / raw)
To: linux-input
Cc: Dmitry Torokhov, Henrik Rydberg, Iiro Valkonen, Joonyoung Shim,
Yufeng Shen, linux-kernel, Michael Gong, Alan Bowens
Atmel mxt1386 touch controller has the touch pressure information but
the current driver atmel_mxt_ts does not expose it to the user space.
This patch makes the driver report the touch pressure information to
user space.
ChangeLog:
v2: fixed indentation as commented by Wanlong Gao
v3: added signed-off-by
Change-Id: Ie0e4683a3cd5ec79222f7682b0ddc24f909af543
Signed-off-by: Yufeng Shen <miletus@chromium.org>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index ae00604..9bdf4e0 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -244,6 +244,7 @@ struct mxt_finger {
int x;
int y;
int area;
+ int pressure;
};
/* Each client has this additional data */
@@ -536,6 +537,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id)
finger[id].x);
input_report_abs(input_dev, ABS_MT_POSITION_Y,
finger[id].y);
+ input_report_abs(input_dev, ABS_MT_PRESSURE,
+ finger[id].pressure);
} else {
finger[id].status = 0;
}
@@ -560,6 +563,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
int x;
int y;
int area;
+ int pressure;
/* Check the touch is present on the screen */
if (!(status & MXT_DETECT)) {
@@ -584,6 +588,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
y = y >> 2;
area = message->message[4];
+ pressure = message->message[5];
dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id,
status & MXT_MOVE ? "moved" : "pressed",
@@ -594,6 +599,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
finger[id].x = x;
finger[id].y = y;
finger[id].area = area;
+ finger[id].pressure = pressure;
mxt_input_report(data, id);
}
@@ -1125,6 +1131,8 @@ static int __devinit mxt_probe(struct i2c_client *client,
0, data->max_x, 0, 0);
input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
0, data->max_y, 0, 0);
+ input_set_abs_params(input_dev, ABS_MT_PRESSURE,
+ 0, 255, 0, 0);
input_set_drvdata(input_dev, data);
i2c_set_clientdata(client, data);
--
1.7.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3] Input: atmel_mxt_ts - Report pressure information from the driver
2011-08-15 15:02 [PATCH v3] Input: atmel_mxt_ts - Report pressure information from the driver Yufeng Shen
@ 2011-08-16 0:22 ` Wanlong Gao
2011-08-16 5:27 ` Henrik Rydberg
1 sibling, 0 replies; 6+ messages in thread
From: Wanlong Gao @ 2011-08-16 0:22 UTC (permalink / raw)
To: Yufeng Shen
Cc: linux-input, Dmitry Torokhov, Henrik Rydberg, Iiro Valkonen,
Joonyoung Shim, linux-kernel, Michael Gong, Alan Bowens
On 08/15/2011 11:02 PM, Yufeng Shen wrote:
> Atmel mxt1386 touch controller has the touch pressure information but
> the current driver atmel_mxt_ts does not expose it to the user space.
> This patch makes the driver report the touch pressure information to
> user space.
>
> ChangeLog:
> v2: fixed indentation as commented by Wanlong Gao
> v3: added signed-off-by
>
> Change-Id: Ie0e4683a3cd5ec79222f7682b0ddc24f909af543
> Signed-off-by: Yufeng Shen<miletus@chromium.org>
Acked-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> ---
> drivers/input/touchscreen/atmel_mxt_ts.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
> index ae00604..9bdf4e0 100644
> --- a/drivers/input/touchscreen/atmel_mxt_ts.c
> +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
> @@ -244,6 +244,7 @@ struct mxt_finger {
> int x;
> int y;
> int area;
> + int pressure;
> };
>
> /* Each client has this additional data */
> @@ -536,6 +537,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id)
> finger[id].x);
> input_report_abs(input_dev, ABS_MT_POSITION_Y,
> finger[id].y);
> + input_report_abs(input_dev, ABS_MT_PRESSURE,
> + finger[id].pressure);
> } else {
> finger[id].status = 0;
> }
> @@ -560,6 +563,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
> int x;
> int y;
> int area;
> + int pressure;
>
> /* Check the touch is present on the screen */
> if (!(status& MXT_DETECT)) {
> @@ -584,6 +588,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
> y = y>> 2;
>
> area = message->message[4];
> + pressure = message->message[5];
>
> dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id,
> status& MXT_MOVE ? "moved" : "pressed",
> @@ -594,6 +599,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
> finger[id].x = x;
> finger[id].y = y;
> finger[id].area = area;
> + finger[id].pressure = pressure;
>
> mxt_input_report(data, id);
> }
> @@ -1125,6 +1131,8 @@ static int __devinit mxt_probe(struct i2c_client *client,
> 0, data->max_x, 0, 0);
> input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
> 0, data->max_y, 0, 0);
> + input_set_abs_params(input_dev, ABS_MT_PRESSURE,
> + 0, 255, 0, 0);
>
> input_set_drvdata(input_dev, data);
> i2c_set_clientdata(client, data);
--
Thanks
Wanlong Gao
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] Input: atmel_mxt_ts - Report pressure information from the driver
2011-08-15 15:02 [PATCH v3] Input: atmel_mxt_ts - Report pressure information from the driver Yufeng Shen
2011-08-16 0:22 ` Wanlong Gao
@ 2011-08-16 5:27 ` Henrik Rydberg
2011-08-16 7:20 ` Dmitry Torokhov
1 sibling, 1 reply; 6+ messages in thread
From: Henrik Rydberg @ 2011-08-16 5:27 UTC (permalink / raw)
To: Yufeng Shen
Cc: linux-input, Dmitry Torokhov, Iiro Valkonen, Joonyoung Shim,
linux-kernel, Michael Gong, Alan Bowens
On Mon, Aug 15, 2011 at 11:02:30AM -0400, Yufeng Shen wrote:
> Atmel mxt1386 touch controller has the touch pressure information but
> the current driver atmel_mxt_ts does not expose it to the user space.
> This patch makes the driver report the touch pressure information to
> user space.
>
> ChangeLog:
> v2: fixed indentation as commented by Wanlong Gao
> v3: added signed-off-by
>
> Change-Id: Ie0e4683a3cd5ec79222f7682b0ddc24f909af543
> Signed-off-by: Yufeng Shen <miletus@chromium.org>
> ---
> drivers/input/touchscreen/atmel_mxt_ts.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
> index ae00604..9bdf4e0 100644
> --- a/drivers/input/touchscreen/atmel_mxt_ts.c
> +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
> @@ -244,6 +244,7 @@ struct mxt_finger {
> int x;
> int y;
> int area;
> + int pressure;
> };
>
> /* Each client has this additional data */
> @@ -536,6 +537,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id)
> finger[id].x);
> input_report_abs(input_dev, ABS_MT_POSITION_Y,
> finger[id].y);
> + input_report_abs(input_dev, ABS_MT_PRESSURE,
> + finger[id].pressure);
> } else {
> finger[id].status = 0;
> }
> @@ -560,6 +563,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
> int x;
> int y;
> int area;
> + int pressure;
>
> /* Check the touch is present on the screen */
> if (!(status & MXT_DETECT)) {
> @@ -584,6 +588,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
> y = y >> 2;
>
> area = message->message[4];
> + pressure = message->message[5];
>
> dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id,
> status & MXT_MOVE ? "moved" : "pressed",
> @@ -594,6 +599,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
> finger[id].x = x;
> finger[id].y = y;
> finger[id].area = area;
> + finger[id].pressure = pressure;
>
> mxt_input_report(data, id);
> }
> @@ -1125,6 +1131,8 @@ static int __devinit mxt_probe(struct i2c_client *client,
> 0, data->max_x, 0, 0);
> input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
> 0, data->max_y, 0, 0);
> + input_set_abs_params(input_dev, ABS_MT_PRESSURE,
> + 0, 255, 0, 0);
>
> input_set_drvdata(input_dev, data);
> i2c_set_clientdata(client, data);
> --
> 1.7.3.1
>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Thanks,
Henrik
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] Input: atmel_mxt_ts - Report pressure information from the driver
2011-08-16 5:27 ` Henrik Rydberg
@ 2011-08-16 7:20 ` Dmitry Torokhov
2011-08-16 18:17 ` Yufeng Shen
0 siblings, 1 reply; 6+ messages in thread
From: Dmitry Torokhov @ 2011-08-16 7:20 UTC (permalink / raw)
To: Henrik Rydberg
Cc: Yufeng Shen, linux-input, Iiro Valkonen, Joonyoung Shim,
linux-kernel, Michael Gong, Alan Bowens
On Tue, Aug 16, 2011 at 07:27:38AM +0200, Henrik Rydberg wrote:
> On Mon, Aug 15, 2011 at 11:02:30AM -0400, Yufeng Shen wrote:
> > Atmel mxt1386 touch controller has the touch pressure information but
> > the current driver atmel_mxt_ts does not expose it to the user space.
> > This patch makes the driver report the touch pressure information to
> > user space.
> >
> > ChangeLog:
> > v2: fixed indentation as commented by Wanlong Gao
> > v3: added signed-off-by
> >
I think we should be reporting pressure for ST emulation as well. Does
the following version still work for you?
Thanks.
--
Dmitry
Input: atmel_mxt_ts - report pressure information from the driver
From: Yufeng Shen <miletus@chromium.org>
Atmel mxt1386 touch controller has the touch pressure information so
let's report it to the user space.
[dtor@mail.ru: added ABS_RESSURE reporting for ST emulation.]
Signed-off-by: Yufeng Shen <miletus@chromium.org>
Acked-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index c4f6b81..5bc2065 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -245,6 +245,7 @@ struct mxt_finger {
int x;
int y;
int area;
+ int pressure;
};
/* Each client has this additional data */
@@ -537,6 +538,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id)
finger[id].x);
input_report_abs(input_dev, ABS_MT_POSITION_Y,
finger[id].y);
+ input_report_abs(input_dev, ABS_MT_PRESSURE,
+ finger[id].pressure);
} else {
finger[id].status = 0;
}
@@ -547,6 +550,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id)
if (status != MXT_RELEASE) {
input_report_abs(input_dev, ABS_X, finger[single_id].x);
input_report_abs(input_dev, ABS_Y, finger[single_id].y);
+ input_report_abs(input_dev,
+ ABS_PRESSURE, finger[single_id].pressure);
}
input_sync(input_dev);
@@ -561,6 +566,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
int x;
int y;
int area;
+ int pressure;
/* Check the touch is present on the screen */
if (!(status & MXT_DETECT)) {
@@ -585,6 +591,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
y = y >> 2;
area = message->message[4];
+ pressure = message->message[5];
dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id,
status & MXT_MOVE ? "moved" : "pressed",
@@ -595,6 +602,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
finger[id].x = x;
finger[id].y = y;
finger[id].area = area;
+ finger[id].pressure = pressure;
mxt_input_report(data, id);
}
@@ -1130,6 +1138,8 @@ static int __devinit mxt_probe(struct i2c_client *client,
0, data->max_x, 0, 0);
input_set_abs_params(input_dev, ABS_Y,
0, data->max_y, 0, 0);
+ input_set_abs_params(input_dev, ABS_PRESSURE,
+ 0, 255, 0, 0);
/* For multi touch */
input_mt_init_slots(input_dev, MXT_MAX_FINGER);
@@ -1139,6 +1149,8 @@ static int __devinit mxt_probe(struct i2c_client *client,
0, data->max_x, 0, 0);
input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
0, data->max_y, 0, 0);
+ input_set_abs_params(input_dev, ABS_MT_PRESSURE,
+ 0, 255, 0, 0);
input_set_drvdata(input_dev, data);
i2c_set_clientdata(client, data);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3] Input: atmel_mxt_ts - Report pressure information from the driver
2011-08-16 7:20 ` Dmitry Torokhov
@ 2011-08-16 18:17 ` Yufeng Shen
2011-08-16 18:27 ` Dmitry Torokhov
0 siblings, 1 reply; 6+ messages in thread
From: Yufeng Shen @ 2011-08-16 18:17 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Henrik Rydberg, linux-input, Iiro Valkonen, Joonyoung Shim,
linux-kernel, Michael Gong, Alan Bowens
Re-sent from proper email account and sorry for the spam.
-----------------------------------------------------------------------------------------------------------------------
Tested that adding ABS_PRESSURE to ST works properly.
Do you want me to submit a new patch or is this good enough for you to merge ?
Thanks.
On Tue, Aug 16, 2011 at 3:20 AM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
>
> On Tue, Aug 16, 2011 at 07:27:38AM +0200, Henrik Rydberg wrote:
> > On Mon, Aug 15, 2011 at 11:02:30AM -0400, Yufeng Shen wrote:
> > > Atmel mxt1386 touch controller has the touch pressure information but
> > > the current driver atmel_mxt_ts does not expose it to the user space.
> > > This patch makes the driver report the touch pressure information to
> > > user space.
> > >
> > > ChangeLog:
> > > v2: fixed indentation as commented by Wanlong Gao
> > > v3: added signed-off-by
> > >
>
> I think we should be reporting pressure for ST emulation as well. Does
> the following version still work for you?
>
> Thanks.
>
> --
> Dmitry
>
> Input: atmel_mxt_ts - report pressure information from the driver
>
> From: Yufeng Shen <miletus@chromium.org>
>
> Atmel mxt1386 touch controller has the touch pressure information so
> let's report it to the user space.
>
> [dtor@mail.ru: added ABS_RESSURE reporting for ST emulation.]
>
> Signed-off-by: Yufeng Shen <miletus@chromium.org>
> Acked-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> Acked-by: Henrik Rydberg <rydberg@euromail.se>
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> ---
>
> drivers/input/touchscreen/atmel_mxt_ts.c | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
>
> diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
> index c4f6b81..5bc2065 100644
> --- a/drivers/input/touchscreen/atmel_mxt_ts.c
> +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
> @@ -245,6 +245,7 @@ struct mxt_finger {
> int x;
> int y;
> int area;
> + int pressure;
> };
>
> /* Each client has this additional data */
> @@ -537,6 +538,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id)
> finger[id].x);
> input_report_abs(input_dev, ABS_MT_POSITION_Y,
> finger[id].y);
> + input_report_abs(input_dev, ABS_MT_PRESSURE,
> + finger[id].pressure);
> } else {
> finger[id].status = 0;
> }
> @@ -547,6 +550,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id)
> if (status != MXT_RELEASE) {
> input_report_abs(input_dev, ABS_X, finger[single_id].x);
> input_report_abs(input_dev, ABS_Y, finger[single_id].y);
> + input_report_abs(input_dev,
> + ABS_PRESSURE, finger[single_id].pressure);
> }
>
> input_sync(input_dev);
> @@ -561,6 +566,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
> int x;
> int y;
> int area;
> + int pressure;
>
> /* Check the touch is present on the screen */
> if (!(status & MXT_DETECT)) {
> @@ -585,6 +591,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
> y = y >> 2;
>
> area = message->message[4];
> + pressure = message->message[5];
>
> dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id,
> status & MXT_MOVE ? "moved" : "pressed",
> @@ -595,6 +602,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
> finger[id].x = x;
> finger[id].y = y;
> finger[id].area = area;
> + finger[id].pressure = pressure;
>
> mxt_input_report(data, id);
> }
> @@ -1130,6 +1138,8 @@ static int __devinit mxt_probe(struct i2c_client *client,
> 0, data->max_x, 0, 0);
> input_set_abs_params(input_dev, ABS_Y,
> 0, data->max_y, 0, 0);
> + input_set_abs_params(input_dev, ABS_PRESSURE,
> + 0, 255, 0, 0);
>
> /* For multi touch */
> input_mt_init_slots(input_dev, MXT_MAX_FINGER);
> @@ -1139,6 +1149,8 @@ static int __devinit mxt_probe(struct i2c_client *client,
> 0, data->max_x, 0, 0);
> input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
> 0, data->max_y, 0, 0);
> + input_set_abs_params(input_dev, ABS_MT_PRESSURE,
> + 0, 255, 0, 0);
>
> input_set_drvdata(input_dev, data);
> i2c_set_clientdata(client, data);
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] Input: atmel_mxt_ts - Report pressure information from the driver
2011-08-16 18:17 ` Yufeng Shen
@ 2011-08-16 18:27 ` Dmitry Torokhov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2011-08-16 18:27 UTC (permalink / raw)
To: Yufeng Shen
Cc: Henrik Rydberg, linux-input, Iiro Valkonen, Joonyoung Shim,
linux-kernel, Michael Gong, Alan Bowens
On Tue, Aug 16, 2011 at 02:17:49PM -0400, Yufeng Shen wrote:
> Re-sent from proper email account and sorry for the spam.
>
> -----------------------------------------------------------------------------------------------------------------------
>
> Tested that adding ABS_PRESSURE to ST works properly.
> Do you want me to submit a new patch or is this good enough for you to merge ?
> Thanks.
No, there is no need to resend.
Thanks.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-16 18:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-15 15:02 [PATCH v3] Input: atmel_mxt_ts - Report pressure information from the driver Yufeng Shen
2011-08-16 0:22 ` Wanlong Gao
2011-08-16 5:27 ` Henrik Rydberg
2011-08-16 7:20 ` Dmitry Torokhov
2011-08-16 18:17 ` Yufeng Shen
2011-08-16 18:27 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).