* [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping
@ 2020-03-10 13:17 Dmitry Mastykin
2020-03-10 13:17 ` [PATCH 2/2] Input: goodix - Ignore spurious interrupts Dmitry Mastykin
2020-03-10 14:40 ` [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping Hans de Goede
0 siblings, 2 replies; 6+ messages in thread
From: Dmitry Mastykin @ 2020-03-10 13:17 UTC (permalink / raw)
To: Dmitry Torokhov, Bastien Nocera, Hans de Goede
Cc: linux-input, Dmitry Mastykin
KEY_LEFTMETA is assigned to the first touch-key (it will be the default
keycode for devices with a single touch-key).
KEY_F1, KEY_F2... are assigned to other touch-keys.
One may assign any keycodes via HWDB.
Previous press/release behavior has changed.
Before: both press/release events were generated on key touch.
Now: press/release events correspond to real touch and release now.
Signed-off-by: Dmitry Mastykin <dmastykin@astralinux.ru>
---
drivers/input/touchscreen/goodix.c | 54 ++++++++++++++++++++++++------
1 file changed, 44 insertions(+), 10 deletions(-)
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index fdec508..6a7ecc6 100644
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -38,6 +38,7 @@
#define GOODIX_CONTACT_SIZE 8
#define GOODIX_MAX_CONTACT_SIZE 9
#define GOODIX_MAX_CONTACTS 10
+#define GOODIX_MAX_KEYS 7
#define GOODIX_CONFIG_MIN_LENGTH 186
#define GOODIX_CONFIG_911_LENGTH 186
@@ -55,6 +56,7 @@
#define GOODIX_REG_ID 0x8140
#define GOODIX_BUFFER_STATUS_READY BIT(7)
+#define GOODIX_HAVE_KEY BIT(4)
#define GOODIX_BUFFER_STATUS_TIMEOUT 20
#define RESOLUTION_LOC 1
@@ -100,6 +102,7 @@ struct goodix_ts_data {
enum goodix_irq_pin_access_method irq_pin_access_method;
unsigned int contact_size;
u8 config[GOODIX_CONFIG_MAX_LENGTH];
+ unsigned short keymap[GOODIX_MAX_KEYS];
};
static int goodix_check_cfg_8(struct goodix_ts_data *ts,
@@ -285,8 +288,14 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
*/
max_timeout = jiffies + msecs_to_jiffies(GOODIX_BUFFER_STATUS_TIMEOUT);
do {
+ /*
+ * We are going to read ts->contact_size * max(1, touch_num) + 2
+ * bytes, where + 2 consists of reading 1 extra byte for the
+ * header + 1 extra byte for the footer which contains the
+ * touch-key code.
+ */
error = goodix_i2c_read(ts->client, GOODIX_READ_COOR_ADDR,
- data, ts->contact_size + 1);
+ data, ts->contact_size + 2);
if (error) {
dev_err(&ts->client->dev, "I2C transfer error: %d\n",
error);
@@ -299,10 +308,10 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
return -EPROTO;
if (touch_num > 1) {
- data += 1 + ts->contact_size;
+ data += 2 + ts->contact_size;
error = goodix_i2c_read(ts->client,
GOODIX_READ_COOR_ADDR +
- 1 + ts->contact_size,
+ 2 + ts->contact_size,
data,
ts->contact_size *
(touch_num - 1));
@@ -353,6 +362,23 @@ static void goodix_ts_report_touch_9b(struct goodix_ts_data *ts, u8 *coor_data)
input_report_abs(ts->input_dev, ABS_MT_WIDTH_MAJOR, input_w);
}
+static void goodix_ts_report_key(struct goodix_ts_data *ts, u8 *data)
+{
+ int touch_num;
+ u8 key_value;
+ int i;
+
+ if (data[0] & GOODIX_HAVE_KEY) {
+ touch_num = data[0] & 0x0f;
+ key_value = data[1 + ts->contact_size * touch_num];
+ for (i = 0; i < GOODIX_MAX_KEYS; ++i)
+ if (key_value & (1 << i))
+ input_report_key(ts->input_dev, ts->keymap[i], 1);
+ } else
+ for (i = 0; i < GOODIX_MAX_KEYS; ++i)
+ input_report_key(ts->input_dev, ts->keymap[i], 0);
+}
+
/**
* goodix_process_events - Process incoming events
*
@@ -363,7 +389,7 @@ static void goodix_ts_report_touch_9b(struct goodix_ts_data *ts, u8 *coor_data)
*/
static void goodix_process_events(struct goodix_ts_data *ts)
{
- u8 point_data[1 + GOODIX_MAX_CONTACT_SIZE * GOODIX_MAX_CONTACTS];
+ u8 point_data[2 + GOODIX_MAX_CONTACT_SIZE * GOODIX_MAX_CONTACTS];
int touch_num;
int i;
@@ -371,11 +397,7 @@ static void goodix_process_events(struct goodix_ts_data *ts)
if (touch_num < 0)
return;
- /*
- * Bit 4 of the first byte reports the status of the capacitive
- * Windows/Home button.
- */
- input_report_key(ts->input_dev, KEY_LEFTMETA, point_data[0] & BIT(4));
+ goodix_ts_report_key(ts, point_data);
for (i = 0; i < touch_num; i++)
if (ts->contact_size == 9)
@@ -961,6 +983,7 @@ static int goodix_i2c_test(struct i2c_client *client)
static int goodix_configure_dev(struct goodix_ts_data *ts)
{
int error;
+ int i;
ts->int_trigger_type = GOODIX_INT_TRIGGER;
ts->max_touch_num = GOODIX_MAX_CONTACTS;
@@ -978,8 +1001,19 @@ static int goodix_configure_dev(struct goodix_ts_data *ts)
ts->input_dev->id.product = ts->id;
ts->input_dev->id.version = ts->version;
+ ts->input_dev->keycode = ts->keymap;
+ ts->input_dev->keycodesize = sizeof(ts->keymap[0]);
+ ts->input_dev->keycodemax = GOODIX_MAX_KEYS;
+
/* Capacitive Windows/Home button on some devices */
- input_set_capability(ts->input_dev, EV_KEY, KEY_LEFTMETA);
+ for (i = 0; i < GOODIX_MAX_KEYS; ++i) {
+ if (i == 0)
+ ts->keymap[i] = KEY_LEFTMETA;
+ else
+ ts->keymap[i] = KEY_F1 + (i - 1);
+
+ input_set_capability(ts->input_dev, EV_KEY, ts->keymap[i]);
+ }
input_set_capability(ts->input_dev, EV_ABS, ABS_MT_POSITION_X);
input_set_capability(ts->input_dev, EV_ABS, ABS_MT_POSITION_Y);
--
2.23.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] Input: goodix - Ignore spurious interrupts
2020-03-10 13:17 [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping Dmitry Mastykin
@ 2020-03-10 13:17 ` Dmitry Mastykin
2020-03-10 14:55 ` Hans de Goede
2020-03-10 14:40 ` [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping Hans de Goede
1 sibling, 1 reply; 6+ messages in thread
From: Dmitry Mastykin @ 2020-03-10 13:17 UTC (permalink / raw)
To: Dmitry Torokhov, Bastien Nocera, Hans de Goede
Cc: linux-input, Dmitry Mastykin
Signed-off-by: Dmitry Mastykin <dmastykin@astralinux.ru>
---
drivers/input/touchscreen/goodix.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index 6a7ecc6..7f8ad6d 100644
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -329,7 +329,7 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
* The Goodix panel will send spurious interrupts after a
* 'finger up' event, which will always cause a timeout.
*/
- return 0;
+ return -ENOMSG;
}
static void goodix_ts_report_touch_8b(struct goodix_ts_data *ts, u8 *coor_data)
--
2.23.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping
2020-03-10 13:17 [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping Dmitry Mastykin
2020-03-10 13:17 ` [PATCH 2/2] Input: goodix - Ignore spurious interrupts Dmitry Mastykin
@ 2020-03-10 14:40 ` Hans de Goede
2020-03-10 15:29 ` Dmitry Mastykin
1 sibling, 1 reply; 6+ messages in thread
From: Hans de Goede @ 2020-03-10 14:40 UTC (permalink / raw)
To: Dmitry Mastykin, Dmitry Torokhov, Bastien Nocera; +Cc: linux-input
Hi,
Thank you for your patches.
On 3/10/20 2:17 PM, Dmitry Mastykin wrote:
> KEY_LEFTMETA is assigned to the first touch-key (it will be the default
> keycode for devices with a single touch-key).
> KEY_F1, KEY_F2... are assigned to other touch-keys.
> One may assign any keycodes via HWDB.
I think the commit message could use some work, e.g. something like this:
###
Subj: Input: goodix - Add support for more then one touch-key
Some devices with a goodix touchscreen have more then 1 capacitive
touch-key. This commit replaces the current support for a single
touch-key, which ignored the reported key-code. With support for
up to 7 touch-keys, based upon checking the key-code which is
post-fixed to any reported touch-data.
KEY_LEFTMETA is assigned to the first touch-key (it will still be
the default keycode for devices with a single touch-key).
KEY_F1, KEY_F2... are assigned as default keycode for the other
touch-keys.
This commit also add supports for keycode remapping, so that
systemd-udev's hwdb can be used to remap the codes to send
keycodes to match the icons on the buttons for devices with more
then 1 touch-key.
###
> Previous press/release behavior has changed.
> Before: both press/release events were generated on key touch.
> Now: press/release events correspond to real touch and release now.
Looking at the old code I do not think that this is correct,
the old code keeps reporting KEY_LEFTMETA as pressed as long as
the GOODIX_HAVE_KEY is set. I guess the undesirable behavior you
describe here was the result of an earlier version of your
patch to support more then one touch key.
> Signed-off-by: Dmitry Mastykin <dmastykin@astralinux.ru>
Other then the remarks about the commit message this looks
good to me.
Regards,
Hans
> ---
> drivers/input/touchscreen/goodix.c | 54 ++++++++++++++++++++++++------
> 1 file changed, 44 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
> index fdec508..6a7ecc6 100644
> --- a/drivers/input/touchscreen/goodix.c
> +++ b/drivers/input/touchscreen/goodix.c
> @@ -38,6 +38,7 @@
> #define GOODIX_CONTACT_SIZE 8
> #define GOODIX_MAX_CONTACT_SIZE 9
> #define GOODIX_MAX_CONTACTS 10
> +#define GOODIX_MAX_KEYS 7
>
> #define GOODIX_CONFIG_MIN_LENGTH 186
> #define GOODIX_CONFIG_911_LENGTH 186
> @@ -55,6 +56,7 @@
> #define GOODIX_REG_ID 0x8140
>
> #define GOODIX_BUFFER_STATUS_READY BIT(7)
> +#define GOODIX_HAVE_KEY BIT(4)
> #define GOODIX_BUFFER_STATUS_TIMEOUT 20
>
> #define RESOLUTION_LOC 1
> @@ -100,6 +102,7 @@ struct goodix_ts_data {
> enum goodix_irq_pin_access_method irq_pin_access_method;
> unsigned int contact_size;
> u8 config[GOODIX_CONFIG_MAX_LENGTH];
> + unsigned short keymap[GOODIX_MAX_KEYS];
> };
>
> static int goodix_check_cfg_8(struct goodix_ts_data *ts,
> @@ -285,8 +288,14 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
> */
> max_timeout = jiffies + msecs_to_jiffies(GOODIX_BUFFER_STATUS_TIMEOUT);
> do {
> + /*
> + * We are going to read ts->contact_size * max(1, touch_num) + 2
> + * bytes, where + 2 consists of reading 1 extra byte for the
> + * header + 1 extra byte for the footer which contains the
> + * touch-key code.
> + */
> error = goodix_i2c_read(ts->client, GOODIX_READ_COOR_ADDR,
> - data, ts->contact_size + 1);
> + data, ts->contact_size + 2);
> if (error) {
> dev_err(&ts->client->dev, "I2C transfer error: %d\n",
> error);
> @@ -299,10 +308,10 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
> return -EPROTO;
>
> if (touch_num > 1) {
> - data += 1 + ts->contact_size;
> + data += 2 + ts->contact_size;
> error = goodix_i2c_read(ts->client,
> GOODIX_READ_COOR_ADDR +
> - 1 + ts->contact_size,
> + 2 + ts->contact_size,
> data,
> ts->contact_size *
> (touch_num - 1));
> @@ -353,6 +362,23 @@ static void goodix_ts_report_touch_9b(struct goodix_ts_data *ts, u8 *coor_data)
> input_report_abs(ts->input_dev, ABS_MT_WIDTH_MAJOR, input_w);
> }
>
> +static void goodix_ts_report_key(struct goodix_ts_data *ts, u8 *data)
> +{
> + int touch_num;
> + u8 key_value;
> + int i;
> +
> + if (data[0] & GOODIX_HAVE_KEY) {
> + touch_num = data[0] & 0x0f;
> + key_value = data[1 + ts->contact_size * touch_num];
> + for (i = 0; i < GOODIX_MAX_KEYS; ++i)
> + if (key_value & (1 << i))
> + input_report_key(ts->input_dev, ts->keymap[i], 1);
> + } else
> + for (i = 0; i < GOODIX_MAX_KEYS; ++i)
> + input_report_key(ts->input_dev, ts->keymap[i], 0);
> +}
> +
> /**
> * goodix_process_events - Process incoming events
> *
> @@ -363,7 +389,7 @@ static void goodix_ts_report_touch_9b(struct goodix_ts_data *ts, u8 *coor_data)
> */
> static void goodix_process_events(struct goodix_ts_data *ts)
> {
> - u8 point_data[1 + GOODIX_MAX_CONTACT_SIZE * GOODIX_MAX_CONTACTS];
> + u8 point_data[2 + GOODIX_MAX_CONTACT_SIZE * GOODIX_MAX_CONTACTS];
> int touch_num;
> int i;
>
> @@ -371,11 +397,7 @@ static void goodix_process_events(struct goodix_ts_data *ts)
> if (touch_num < 0)
> return;
>
> - /*
> - * Bit 4 of the first byte reports the status of the capacitive
> - * Windows/Home button.
> - */
> - input_report_key(ts->input_dev, KEY_LEFTMETA, point_data[0] & BIT(4));
> + goodix_ts_report_key(ts, point_data);
>
> for (i = 0; i < touch_num; i++)
> if (ts->contact_size == 9)
> @@ -961,6 +983,7 @@ static int goodix_i2c_test(struct i2c_client *client)
> static int goodix_configure_dev(struct goodix_ts_data *ts)
> {
> int error;
> + int i;
>
> ts->int_trigger_type = GOODIX_INT_TRIGGER;
> ts->max_touch_num = GOODIX_MAX_CONTACTS;
> @@ -978,8 +1001,19 @@ static int goodix_configure_dev(struct goodix_ts_data *ts)
> ts->input_dev->id.product = ts->id;
> ts->input_dev->id.version = ts->version;
>
> + ts->input_dev->keycode = ts->keymap;
> + ts->input_dev->keycodesize = sizeof(ts->keymap[0]);
> + ts->input_dev->keycodemax = GOODIX_MAX_KEYS;
> +
> /* Capacitive Windows/Home button on some devices */
> - input_set_capability(ts->input_dev, EV_KEY, KEY_LEFTMETA);
> + for (i = 0; i < GOODIX_MAX_KEYS; ++i) {
> + if (i == 0)
> + ts->keymap[i] = KEY_LEFTMETA;
> + else
> + ts->keymap[i] = KEY_F1 + (i - 1);
> +
> + input_set_capability(ts->input_dev, EV_KEY, ts->keymap[i]);
> + }
>
> input_set_capability(ts->input_dev, EV_ABS, ABS_MT_POSITION_X);
> input_set_capability(ts->input_dev, EV_ABS, ABS_MT_POSITION_Y);
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] Input: goodix - Ignore spurious interrupts
2020-03-10 13:17 ` [PATCH 2/2] Input: goodix - Ignore spurious interrupts Dmitry Mastykin
@ 2020-03-10 14:55 ` Hans de Goede
0 siblings, 0 replies; 6+ messages in thread
From: Hans de Goede @ 2020-03-10 14:55 UTC (permalink / raw)
To: Dmitry Mastykin, Dmitry Torokhov, Bastien Nocera; +Cc: linux-input
Hi,
On 3/10/20 2:17 PM, Dmitry Mastykin wrote:
This patch completely lacks a "body" for the commit message,
please write a paragraph about why you are making this change
here.
Regards,
Hans
> Signed-off-by: Dmitry Mastykin <dmastykin@astralinux.ru>
> ---
> drivers/input/touchscreen/goodix.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
> index 6a7ecc6..7f8ad6d 100644
> --- a/drivers/input/touchscreen/goodix.c
> +++ b/drivers/input/touchscreen/goodix.c
> @@ -329,7 +329,7 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
> * The Goodix panel will send spurious interrupts after a
> * 'finger up' event, which will always cause a timeout.
> */
> - return 0;
> + return -ENOMSG;
> }
>
> static void goodix_ts_report_touch_8b(struct goodix_ts_data *ts, u8 *coor_data)
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping
2020-03-10 14:40 ` [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping Hans de Goede
@ 2020-03-10 15:29 ` Dmitry Mastykin
2020-03-10 15:37 ` Hans de Goede
0 siblings, 1 reply; 6+ messages in thread
From: Dmitry Mastykin @ 2020-03-10 15:29 UTC (permalink / raw)
To: Hans de Goede, Dmitry Torokhov, Bastien Nocera; +Cc: linux-input
Hi Hans,
thank you for the suggested ideas for the patches, reviewing them, and
for suggested commit message in the last mail.
Should I change patch to v2 after correcting the commit message?
>> Previous press/release behavior has changed.
>> Before: both press/release events were generated on key touch.
>> Now: press/release events correspond to real touch and release now.
>
> Looking at the old code I do not think that this is correct,
> the old code keeps reporting KEY_LEFTMETA as pressed as long as
> the GOODIX_HAVE_KEY is set. I guess the undesirable behavior you
> describe here was the result of an earlier version of your
> patch to support more then one touch key.
>
I've just tested the old code: it has wrong behavior. And the patch 2/2
("Input: goodix - Ignore spurious interrupts", 2020-03-10) makes it correct.
Kind regards
Dmitry Mastykin
On 3/10/20 5:40 PM, Hans de Goede wrote:
> Hi,
>
> Thank you for your patches.
>
> On 3/10/20 2:17 PM, Dmitry Mastykin wrote:
>> KEY_LEFTMETA is assigned to the first touch-key (it will be the default
>> keycode for devices with a single touch-key).
>> KEY_F1, KEY_F2... are assigned to other touch-keys.
>> One may assign any keycodes via HWDB.
>
> I think the commit message could use some work, e.g. something like this:
>
> ###
>
> Subj: Input: goodix - Add support for more then one touch-key
>
> Some devices with a goodix touchscreen have more then 1 capacitive
> touch-key. This commit replaces the current support for a single
> touch-key, which ignored the reported key-code. With support for
> up to 7 touch-keys, based upon checking the key-code which is
> post-fixed to any reported touch-data.
>
> KEY_LEFTMETA is assigned to the first touch-key (it will still be
> the default keycode for devices with a single touch-key).
> KEY_F1, KEY_F2... are assigned as default keycode for the other
> touch-keys.
>
> This commit also add supports for keycode remapping, so that
> systemd-udev's hwdb can be used to remap the codes to send
> keycodes to match the icons on the buttons for devices with more
> then 1 touch-key.
>
> ###
>
>> Previous press/release behavior has changed.
>> Before: both press/release events were generated on key touch.
>> Now: press/release events correspond to real touch and release now.
>
> Looking at the old code I do not think that this is correct,
> the old code keeps reporting KEY_LEFTMETA as pressed as long as
> the GOODIX_HAVE_KEY is set. I guess the undesirable behavior you
> describe here was the result of an earlier version of your
> patch to support more then one touch key.
>
>> Signed-off-by: Dmitry Mastykin <dmastykin@astralinux.ru>
>
> Other then the remarks about the commit message this looks
> good to me.
>
> Regards,
>
> Hans
>
>
>> ---
>> drivers/input/touchscreen/goodix.c | 54 ++++++++++++++++++++++++------
>> 1 file changed, 44 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/input/touchscreen/goodix.c
b/drivers/input/touchscreen/goodix.c
>> index fdec508..6a7ecc6 100644
>> --- a/drivers/input/touchscreen/goodix.c
>> +++ b/drivers/input/touchscreen/goodix.c
>> @@ -38,6 +38,7 @@
>> #define GOODIX_CONTACT_SIZE 8
>> #define GOODIX_MAX_CONTACT_SIZE 9
>> #define GOODIX_MAX_CONTACTS 10
>> +#define GOODIX_MAX_KEYS 7
>> #define GOODIX_CONFIG_MIN_LENGTH 186
>> #define GOODIX_CONFIG_911_LENGTH 186
>> @@ -55,6 +56,7 @@
>> #define GOODIX_REG_ID 0x8140
>> #define GOODIX_BUFFER_STATUS_READY BIT(7)
>> +#define GOODIX_HAVE_KEY BIT(4)
>> #define GOODIX_BUFFER_STATUS_TIMEOUT 20
>> #define RESOLUTION_LOC 1
>> @@ -100,6 +102,7 @@ struct goodix_ts_data {
>> enum goodix_irq_pin_access_method irq_pin_access_method;
>> unsigned int contact_size;
>> u8 config[GOODIX_CONFIG_MAX_LENGTH];
>> + unsigned short keymap[GOODIX_MAX_KEYS];
>> };
>> static int goodix_check_cfg_8(struct goodix_ts_data *ts,
>> @@ -285,8 +288,14 @@ static int goodix_ts_read_input_report(struct
goodix_ts_data *ts, u8 *data)
>> */
>> max_timeout = jiffies +
msecs_to_jiffies(GOODIX_BUFFER_STATUS_TIMEOUT);
>> do {
>> + /*
>> + * We are going to read ts->contact_size * max(1,
touch_num) + 2
>> + * bytes, where + 2 consists of reading 1 extra byte for the
>> + * header + 1 extra byte for the footer which contains the
>> + * touch-key code.
>> + */
>> error = goodix_i2c_read(ts->client, GOODIX_READ_COOR_ADDR,
>> - data, ts->contact_size + 1);
>> + data, ts->contact_size + 2);
>> if (error) {
>> dev_err(&ts->client->dev, "I2C transfer error: %d\n",
>> error);
>> @@ -299,10 +308,10 @@ static int goodix_ts_read_input_report(struct
goodix_ts_data *ts, u8 *data)
>> return -EPROTO;
>> if (touch_num > 1) {
>> - data += 1 + ts->contact_size;
>> + data += 2 + ts->contact_size;
>> error = goodix_i2c_read(ts->client,
>> GOODIX_READ_COOR_ADDR +
>> - 1 + ts->contact_size,
>> + 2 + ts->contact_size,
>> data,
>> ts->contact_size *
>> (touch_num - 1));
>> @@ -353,6 +362,23 @@ static void goodix_ts_report_touch_9b(struct
goodix_ts_data *ts, u8 *coor_data)
>> input_report_abs(ts->input_dev, ABS_MT_WIDTH_MAJOR, input_w);
>> }
>> +static void goodix_ts_report_key(struct goodix_ts_data *ts, u8 *data)
>> +{
>> + int touch_num;
>> + u8 key_value;
>> + int i;
>> +
>> + if (data[0] & GOODIX_HAVE_KEY) {
>> + touch_num = data[0] & 0x0f;
>> + key_value = data[1 + ts->contact_size * touch_num];
>> + for (i = 0; i < GOODIX_MAX_KEYS; ++i)
>> + if (key_value & (1 << i))
>> + input_report_key(ts->input_dev, ts->keymap[i], 1);
>> + } else
>> + for (i = 0; i < GOODIX_MAX_KEYS; ++i)
>> + input_report_key(ts->input_dev, ts->keymap[i], 0);
>> +}
>> +
>> /**
>> * goodix_process_events - Process incoming events
>> *
>> @@ -363,7 +389,7 @@ static void goodix_ts_report_touch_9b(struct
goodix_ts_data *ts, u8 *coor_data)
>> */
>> static void goodix_process_events(struct goodix_ts_data *ts)
>> {
>> - u8 point_data[1 + GOODIX_MAX_CONTACT_SIZE * GOODIX_MAX_CONTACTS];
>> + u8 point_data[2 + GOODIX_MAX_CONTACT_SIZE * GOODIX_MAX_CONTACTS];
>> int touch_num;
>> int i;
>> @@ -371,11 +397,7 @@ static void goodix_process_events(struct
goodix_ts_data *ts)
>> if (touch_num < 0)
>> return;
>> - /*
>> - * Bit 4 of the first byte reports the status of the capacitive
>> - * Windows/Home button.
>> - */
>> - input_report_key(ts->input_dev, KEY_LEFTMETA, point_data[0] &
BIT(4));
>> + goodix_ts_report_key(ts, point_data);
>> for (i = 0; i < touch_num; i++)
>> if (ts->contact_size == 9)
>> @@ -961,6 +983,7 @@ static int goodix_i2c_test(struct i2c_client
*client)
>> static int goodix_configure_dev(struct goodix_ts_data *ts)
>> {
>> int error;
>> + int i;
>> ts->int_trigger_type = GOODIX_INT_TRIGGER;
>> ts->max_touch_num = GOODIX_MAX_CONTACTS;
>> @@ -978,8 +1001,19 @@ static int goodix_configure_dev(struct
goodix_ts_data *ts)
>> ts->input_dev->id.product = ts->id;
>> ts->input_dev->id.version = ts->version;
>> + ts->input_dev->keycode = ts->keymap;
>> + ts->input_dev->keycodesize = sizeof(ts->keymap[0]);
>> + ts->input_dev->keycodemax = GOODIX_MAX_KEYS;
>> +
>> /* Capacitive Windows/Home button on some devices */
>> - input_set_capability(ts->input_dev, EV_KEY, KEY_LEFTMETA);
>> + for (i = 0; i < GOODIX_MAX_KEYS; ++i) {
>> + if (i == 0)
>> + ts->keymap[i] = KEY_LEFTMETA;
>> + else
>> + ts->keymap[i] = KEY_F1 + (i - 1);
>> +
>> + input_set_capability(ts->input_dev, EV_KEY, ts->keymap[i]);
>> + }
>> input_set_capability(ts->input_dev, EV_ABS, ABS_MT_POSITION_X);
>> input_set_capability(ts->input_dev, EV_ABS, ABS_MT_POSITION_Y);
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping
2020-03-10 15:29 ` Dmitry Mastykin
@ 2020-03-10 15:37 ` Hans de Goede
0 siblings, 0 replies; 6+ messages in thread
From: Hans de Goede @ 2020-03-10 15:37 UTC (permalink / raw)
To: Dmitry Mastykin, Dmitry Torokhov, Bastien Nocera; +Cc: linux-input
Hi,
On 3/10/20 4:29 PM, Dmitry Mastykin wrote:
>
> Hi Hans,
>
> thank you for the suggested ideas for the patches, reviewing them, and for suggested commit message in the last mail.
You're welcome.
> Should I change patch to v2 after correcting the commit message?
Yes the normal way to do this is to use:
git send-email --subject-prefix="PATCH v2" ...
When sending and add a changelog to the commit message after your
Signed-off-by, like this:
Signed-off-by: ...
---
Changes in v2:
- Improve commit message
When Dmitry Torokhov then applies these patches, git am will
automatically remove the changelog (which is mainly for reviewing
purposes) because it ignores everything after the first '---' line.
Regards,
Hans
> >> Previous press/release behavior has changed.
> >> Before: both press/release events were generated on key touch.
> >> Now: press/release events correspond to real touch and release now.
> >
> > Looking at the old code I do not think that this is correct,
> > the old code keeps reporting KEY_LEFTMETA as pressed as long as
> > the GOODIX_HAVE_KEY is set. I guess the undesirable behavior you
> > describe here was the result of an earlier version of your
> > patch to support more then one touch key.
> >
> I've just tested the old code: it has wrong behavior. And the patch 2/2 ("Input: goodix - Ignore spurious interrupts", 2020-03-10) makes it correct.
Ah ok, that explains. Well then this bit should probably go to the
commit message of 2/2, since the problem will still exist after 1/2, right?
>
> Kind regards
> Dmitry Mastykin
>
>
> On 3/10/20 5:40 PM, Hans de Goede wrote:
> > Hi,
> >
> > Thank you for your patches.
> >
> > On 3/10/20 2:17 PM, Dmitry Mastykin wrote:
> >> KEY_LEFTMETA is assigned to the first touch-key (it will be the default
> >> keycode for devices with a single touch-key).
> >> KEY_F1, KEY_F2... are assigned to other touch-keys.
> >> One may assign any keycodes via HWDB.
> >
> > I think the commit message could use some work, e.g. something like this:
> >
> > ###
> >
> > Subj: Input: goodix - Add support for more then one touch-key
> >
> > Some devices with a goodix touchscreen have more then 1 capacitive
> > touch-key. This commit replaces the current support for a single
> > touch-key, which ignored the reported key-code. With support for
> > up to 7 touch-keys, based upon checking the key-code which is
> > post-fixed to any reported touch-data.
> >
> > KEY_LEFTMETA is assigned to the first touch-key (it will still be
> > the default keycode for devices with a single touch-key).
> > KEY_F1, KEY_F2... are assigned as default keycode for the other
> > touch-keys.
> >
> > This commit also add supports for keycode remapping, so that
> > systemd-udev's hwdb can be used to remap the codes to send
> > keycodes to match the icons on the buttons for devices with more
> > then 1 touch-key.
> >
> > ###
> >
> >> Previous press/release behavior has changed.
> >> Before: both press/release events were generated on key touch.
> >> Now: press/release events correspond to real touch and release now.
> >
> > Looking at the old code I do not think that this is correct,
> > the old code keeps reporting KEY_LEFTMETA as pressed as long as
> > the GOODIX_HAVE_KEY is set. I guess the undesirable behavior you
> > describe here was the result of an earlier version of your
> > patch to support more then one touch key.
> >
> >> Signed-off-by: Dmitry Mastykin <dmastykin@astralinux.ru>
> >
> > Other then the remarks about the commit message this looks
> > good to me.
> >
> > Regards,
> >
> > Hans
> >
> >
> >> ---
> >> drivers/input/touchscreen/goodix.c | 54 ++++++++++++++++++++++++------
> >> 1 file changed, 44 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
> >> index fdec508..6a7ecc6 100644
> >> --- a/drivers/input/touchscreen/goodix.c
> >> +++ b/drivers/input/touchscreen/goodix.c
> >> @@ -38,6 +38,7 @@
> >> #define GOODIX_CONTACT_SIZE 8
> >> #define GOODIX_MAX_CONTACT_SIZE 9
> >> #define GOODIX_MAX_CONTACTS 10
> >> +#define GOODIX_MAX_KEYS 7
> >> #define GOODIX_CONFIG_MIN_LENGTH 186
> >> #define GOODIX_CONFIG_911_LENGTH 186
> >> @@ -55,6 +56,7 @@
> >> #define GOODIX_REG_ID 0x8140
> >> #define GOODIX_BUFFER_STATUS_READY BIT(7)
> >> +#define GOODIX_HAVE_KEY BIT(4)
> >> #define GOODIX_BUFFER_STATUS_TIMEOUT 20
> >> #define RESOLUTION_LOC 1
> >> @@ -100,6 +102,7 @@ struct goodix_ts_data {
> >> enum goodix_irq_pin_access_method irq_pin_access_method;
> >> unsigned int contact_size;
> >> u8 config[GOODIX_CONFIG_MAX_LENGTH];
> >> + unsigned short keymap[GOODIX_MAX_KEYS];
> >> };
> >> static int goodix_check_cfg_8(struct goodix_ts_data *ts,
> >> @@ -285,8 +288,14 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
> >> */
> >> max_timeout = jiffies + msecs_to_jiffies(GOODIX_BUFFER_STATUS_TIMEOUT);
> >> do {
> >> + /*
> >> + * We are going to read ts->contact_size * max(1, touch_num) + 2
> >> + * bytes, where + 2 consists of reading 1 extra byte for the
> >> + * header + 1 extra byte for the footer which contains the
> >> + * touch-key code.
> >> + */
> >> error = goodix_i2c_read(ts->client, GOODIX_READ_COOR_ADDR,
> >> - data, ts->contact_size + 1);
> >> + data, ts->contact_size + 2);
> >> if (error) {
> >> dev_err(&ts->client->dev, "I2C transfer error: %d\n",
> >> error);
> >> @@ -299,10 +308,10 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
> >> return -EPROTO;
> >> if (touch_num > 1) {
> >> - data += 1 + ts->contact_size;
> >> + data += 2 + ts->contact_size;
> >> error = goodix_i2c_read(ts->client,
> >> GOODIX_READ_COOR_ADDR +
> >> - 1 + ts->contact_size,
> >> + 2 + ts->contact_size,
> >> data,
> >> ts->contact_size *
> >> (touch_num - 1));
> >> @@ -353,6 +362,23 @@ static void goodix_ts_report_touch_9b(struct goodix_ts_data *ts, u8 *coor_data)
> >> input_report_abs(ts->input_dev, ABS_MT_WIDTH_MAJOR, input_w);
> >> }
> >> +static void goodix_ts_report_key(struct goodix_ts_data *ts, u8 *data)
> >> +{
> >> + int touch_num;
> >> + u8 key_value;
> >> + int i;
> >> +
> >> + if (data[0] & GOODIX_HAVE_KEY) {
> >> + touch_num = data[0] & 0x0f;
> >> + key_value = data[1 + ts->contact_size * touch_num];
> >> + for (i = 0; i < GOODIX_MAX_KEYS; ++i)
> >> + if (key_value & (1 << i))
> >> + input_report_key(ts->input_dev, ts->keymap[i], 1);
> >> + } else
> >> + for (i = 0; i < GOODIX_MAX_KEYS; ++i)
> >> + input_report_key(ts->input_dev, ts->keymap[i], 0);
> >> +}
> >> +
> >> /**
> >> * goodix_process_events - Process incoming events
> >> *
> >> @@ -363,7 +389,7 @@ static void goodix_ts_report_touch_9b(struct goodix_ts_data *ts, u8 *coor_data)
> >> */
> >> static void goodix_process_events(struct goodix_ts_data *ts)
> >> {
> >> - u8 point_data[1 + GOODIX_MAX_CONTACT_SIZE * GOODIX_MAX_CONTACTS];
> >> + u8 point_data[2 + GOODIX_MAX_CONTACT_SIZE * GOODIX_MAX_CONTACTS];
> >> int touch_num;
> >> int i;
> >> @@ -371,11 +397,7 @@ static void goodix_process_events(struct goodix_ts_data *ts)
> >> if (touch_num < 0)
> >> return;
> >> - /*
> >> - * Bit 4 of the first byte reports the status of the capacitive
> >> - * Windows/Home button.
> >> - */
> >> - input_report_key(ts->input_dev, KEY_LEFTMETA, point_data[0] & BIT(4));
> >> + goodix_ts_report_key(ts, point_data);
> >> for (i = 0; i < touch_num; i++)
> >> if (ts->contact_size == 9)
> >> @@ -961,6 +983,7 @@ static int goodix_i2c_test(struct i2c_client *client)
> >> static int goodix_configure_dev(struct goodix_ts_data *ts)
> >> {
> >> int error;
> >> + int i;
> >> ts->int_trigger_type = GOODIX_INT_TRIGGER;
> >> ts->max_touch_num = GOODIX_MAX_CONTACTS;
> >> @@ -978,8 +1001,19 @@ static int goodix_configure_dev(struct goodix_ts_data *ts)
> >> ts->input_dev->id.product = ts->id;
> >> ts->input_dev->id.version = ts->version;
> >> + ts->input_dev->keycode = ts->keymap;
> >> + ts->input_dev->keycodesize = sizeof(ts->keymap[0]);
> >> + ts->input_dev->keycodemax = GOODIX_MAX_KEYS;
> >> +
> >> /* Capacitive Windows/Home button on some devices */
> >> - input_set_capability(ts->input_dev, EV_KEY, KEY_LEFTMETA);
> >> + for (i = 0; i < GOODIX_MAX_KEYS; ++i) {
> >> + if (i == 0)
> >> + ts->keymap[i] = KEY_LEFTMETA;
> >> + else
> >> + ts->keymap[i] = KEY_F1 + (i - 1);
> >> +
> >> + input_set_capability(ts->input_dev, EV_KEY, ts->keymap[i]);
> >> + }
> >> input_set_capability(ts->input_dev, EV_ABS, ABS_MT_POSITION_X);
> >> input_set_capability(ts->input_dev, EV_ABS, ABS_MT_POSITION_Y);
> >>
> >
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-03-10 15:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-10 13:17 [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping Dmitry Mastykin
2020-03-10 13:17 ` [PATCH 2/2] Input: goodix - Ignore spurious interrupts Dmitry Mastykin
2020-03-10 14:55 ` Hans de Goede
2020-03-10 14:40 ` [PATCH 1/2] Input: goodix - Add support for touch-keys and keycode mapping Hans de Goede
2020-03-10 15:29 ` Dmitry Mastykin
2020-03-10 15:37 ` Hans de Goede
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).