input: elants: Support Asus TF300T touchscreen
Subsystems (3)
v5 cover input: elants: Support Asus TF300T touchscreen
This series cleans up the driver a bit and implements changes needed to support EKTF3624-based touchscreen used in Asus TF300T and similar Tegra3-based tablets.
---
v2: extended with Dmitry's patches (replaced v1 patches 3 and 4)
v3: rebased for v5.7-rc1
v4: rebased onto v5.7-rc2+ (current Linus' master)
update "remove unused axes" and "refactor
elants_i2c_execute_command()" patches after review
add David's patch converting DT binding to YAML
v5: rebased onto dtor/input/for-linus
---
David Heidelberg (1):
dt-bindings: input: touchscreen: elants_i2c: convert to YAML
Dmitry Osipenko (3):
input: elants: support 0x66 reply opcode for reporting touches
dt-bindings: input: elants-i2c: Document common touchscreen properties
dt-bindings: input: elants-i2c: Document eKTF3624
Michał Mirosław (6):
input: elants: document some registers and values
input: elants: support old touch report format
input: elants: remove unused axes
input: elants: override touchscreen info with DT properties
input: elants: refactor elants_i2c_execute_command()
input: elants: read touchscreen size for EKTF3624
.../devicetree/bindings/input/elants_i2c.txt | 34 -- .../input/touchscreen/elan,elants_i2c.yaml | 69 ++++ drivers/input/touchscreen/elants_i2c.c | 380 +++++++++++------- 3 files changed, 314 insertions(+), 169 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/elants_i2c.txt create mode 100644 Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml
Signature · 1 line
2.20.1
PATCH v5 1/10 input: elants: document some registers and values
Add information found in downstream kernels, to make the code less magic.
--- drivers/input/touchscreen/elants_i2c.c | 29 +++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
drivers/input/touchscreen/elants_i2c.c +24 -5
@@ -81,7 +81,11 @@#define HEADER_REPORT_10_FINGER 0x62 -/* Header (4 bytes) plus 3 fill 10-finger packets */ +/* Power state */ +#define PWR_STATE_DEEP_SLEEP 0 +#define PWR_STATE_NORMAL 1 + +/* Header (4 bytes) plus 3 full 10-finger packets */ #define MAX_PACKET_SIZE 169#define BOOT_TIME_DELAY_MS 50
@@ -91,10 +95,21 @@#define E_ELAN_INFO_BC_VER 0x10#define E_ELAN_INFO_TEST_VER 0xE0#define E_ELAN_INFO_FW_ID 0xF0 +#define E_POWER_MODE 0x40 +#define E_POWER_STATE 0x50 +#define E_INFO_X_RES 0x60 +#define E_INFO_Y_RES 0x63#define E_INFO_OSR 0xD6#define E_INFO_PHY_SCAN 0xD7#define E_INFO_PHY_DRIVER 0xD8 +/* FW write command, 0x54 0x?? 0x0, 0x01 */ +#define E_POWER_MODE_BATTERY 0x40 +#define E_POWER_MODE_AC 0x41 +#define E_POWER_MODE_USB 0x42 +#define E_POWER_STATE_SLEEP 0x50 +#define E_POWER_STATE_RESUME 0x58 +#define MAX_RETRIES 3#define MAX_FW_UPDATE_RETRIES 30
@@ -239,8 +254,8 @@ static int elants_i2c_calibrate(struct elants_data *ts) {struct i2c_client *client = ts->client;int ret, error; -static const u8 w_flashkey[] = {0x54 ,0xC0 ,0xE1 ,0x5A }; -static const u8 rek[] = {0x54 ,0x29 ,0x00 ,0x01 }; +static const u8 w_flashkey[] = {CMD_HEADER_WRITE ,0xC0 ,0xE1 ,0x5A }; +static const u8 rek[] = {CMD_HEADER_WRITE ,0x29 ,0x00 ,0x01 };static const u8 rek_resp[] = {CMD_HEADER_REK ,0x66 ,0x66 ,0x66 };disable_irq (client->irq);
@@ -1366,7 +1381,9 @@ static int __maybe_unused elants_i2c_suspend(struct device *dev) {struct i2c_client *client =to_i2c_client (dev);struct elants_data *ts =i2c_get_clientdata (client); -const u8 set_sleep_cmd[] = {0x54 ,0x50 ,0x00 ,0x01 }; +const u8 set_sleep_cmd[] = { +CMD_HEADER_WRITE ,E_POWER_STATE_SLEEP ,0x00 ,0x01 + };int retry_cnt;int error;
@@ -1403,7 +1420,9 @@ static int __maybe_unused elants_i2c_resume(struct device *dev) {struct i2c_client *client =to_i2c_client (dev);struct elants_data *ts =i2c_get_clientdata (client); -const u8 set_active_cmd[] = {0x54 ,0x58 ,0x00 ,0x01 }; +const u8 set_active_cmd[] = { +CMD_HEADER_WRITE ,E_POWER_STATE_RESUME ,0x00 ,0x01 + };int retry_cnt;int error;
Signature · 1 line
2.20.1
Dmitry Torokhov
maintainerRe: [PATCH v5 01/10] input: elants: document some registers and values
Quoted 28 lines · Michał Mirosław
Add information found in downstream kernels, to make the code less magic.
Signed-off-by Michał Mirosław <[email protected]>Reviewed-by Dmitry Osipenko <[email protected]>Tested-by Dmitry Osipenko <[email protected]>--- drivers/input/touchscreen/elants_i2c.c | 29 +++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)drivers/input/touchscreen/elants_i2c.c +5
-1@@ -81,7 +81,11 @@#define HEADER_REPORT_10_FINGER 0x62 -/* Header (4 bytes) plus 3 fill 10-finger packets */ +/* Power state */ +#define PWR_STATE_DEEP_SLEEP 0 +#define PWR_STATE_NORMAL 1 + +/* Header (4 bytes) plus 3 full 10-finger packets */ #define MAX_PACKET_SIZE 169#define BOOT_TIME_DELAY_MS 50
drivers/input/touchscreen/elants_i2c.c line 101
Quoted 7 lines
drivers/input/touchscreen/elants_i2c.c +4
-0@@ -91,10 +95,21 @@#define E_ELAN_INFO_BC_VER 0x10#define E_ELAN_INFO_TEST_VER 0xE0#define E_ELAN_INFO_FW_ID 0xF0 +#define E_POWER_MODE 0x40 +#define E_POWER_STATE 0x50 +#define E_INFO_X_RES 0x60 +#define E_INFO_Y_RES 0x63
I would prefer if we introduced these in the patches that use them.
drivers/input/touchscreen/elants_i2c.c line 109
Quoted 8 lines
drivers/input/touchscreen/elants_i2c.c +4
-0#define E_INFO_OSR 0xD6#define E_INFO_PHY_SCAN 0xD7#define E_INFO_PHY_DRIVER 0xD8 +/* FW write command, 0x54 0x?? 0x0, 0x01 */ +#define E_POWER_MODE_BATTERY 0x40 +#define E_POWER_MODE_AC 0x41 +#define E_POWER_MODE_USB 0x42
What is this for?
drivers/input/touchscreen/elants_i2c.c line 111
Quoted 2 lines
drivers/input/touchscreen/elants_i2c.c +2
-0+#define E_POWER_STATE_SLEEP 0x50 +#define E_POWER_STATE_RESUME 0x58
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH v5 01/10] input: elants: document some registers and values
18.05.2020 07:07, Dmitry Torokhov пишет:
...
Quoted 6 lines
drivers/input/touchscreen/elants_i2c.c line 109
Quoted 4 lines
drivers/input/touchscreen/elants_i2c.c +4
-0+/* FW write command, 0x54 0x?? 0x0, 0x01 */ +#define E_POWER_MODE_BATTERY 0x40 +#define E_POWER_MODE_AC 0x41 +#define E_POWER_MODE_USB 0x42What is this for?
It is possible to switch the touchscreen's power source. Downstream kernel switches away from the battery source when USB cable is connected and baterry is charging. This is not supported by upstream driver yet, I guess it should be good to postpone adding these FW opcodes until they will become actually needed.
PATCH v5 2/10 input: elants: support old touch report format
In reply to Michał MirosławSupport ELAN touchpad sensor with older firmware as found on eg. Asus Transformer Pads.
--- drivers/input/touchscreen/elants_i2c.c | 36 ++++++++++++++++++-------- 1 file changed, 25 insertions(+), 11 deletions(-)
drivers/input/touchscreen/elants_i2c.c +25 -11
@@ -68,6 +68,7 @@#define CMD_HEADER_REK 0x66/* FW position data */ +#define PACKET_SIZE_OLD 40#define PACKET_SIZE 55#define MAX_CONTACT_NUM 10#define FW_POS_HEADER 0
@@ -855,7 +856,8 @@ static int elants_i2c_fw_update(struct elants_data *ts)* Event reporting. */ -static void elants_i2c_mt_event (struct elants_data *ts,u8 *buf) +static void elants_i2c_mt_event (struct elants_data *ts,u8 *buf, +size_t report_len) {struct input_dev *input = ts->input;unsigned int n_fingers;
@@ -868,7 +870,8 @@ static void elants_i2c_mt_event(struct elants_data *ts, u8 *buf) buf[FW_POS_STATE ];dev_dbg (&ts->client->dev, -"n_fingers: %u, state: %04x\n" , n_fingers, finger_state); +"n_fingers: %u, state: %04x, report_len: %zu\n" , + n_fingers, finger_state, report_len);/* Note: all fingers have the same tool type */ tool_type = buf[FW_POS_TOOL_TYPE] & BIT(0) ?
@@ -882,8 +885,16 @@ static void elants_i2c_mt_event(struct elants_data *ts, u8 *buf) pos = &buf[FW_POS_XY + i *3 ]; x = (((u16 )pos[0 ] &0xf0 ) <<4 ) | pos[1 ]; y = (((u16 )pos[0 ] &0x0f ) <<8 ) | pos[2 ]; - p = buf[FW_POS_PRESSURE + i]; - w = buf[FW_POS_WIDTH + i]; +if (report_len ==PACKET_SIZE_OLD ) { + w = buf[FW_POS_WIDTH + i /2 ]; + w >>=4 * (~i &1 );// little-endian-nibbles + w |= w <<4 ; + w |= !w; + p = w; + }else { + p = buf[FW_POS_PRESSURE + i]; + w = buf[FW_POS_WIDTH + i]; + }dev_dbg (&ts->client->dev,"i=%d x=%d y=%d p=%d w=%d\n" , i, x, y, p, w);
@@ -916,7 +927,8 @@ static u8 elants_i2c_calculate_checksum(u8 *buf)return checksum; } -static void elants_i2c_event (struct elants_data *ts,u8 *buf) +static void elants_i2c_event (struct elants_data *ts,u8 *buf, +size_t report_len) {u8 checksum =elants_i2c_calculate_checksum (buf);
@@ -930,7 +942,7 @@ static void elants_i2c_event(struct elants_data *ts, u8 *buf)"%s: unknown packet type: %02x\n" , __func__, buf[FW_POS_HEADER]); else -elants_i2c_mt_event (ts ,buf ); +elants_i2c_mt_event (ts ,buf ,report_len ); }static irqreturn_t elants_i2c_irq (int irq,void *_dev)
@@ -988,7 +1000,8 @@ static irqreturn_t elants_i2c_irq(int irq, void *_dev)break ;case QUEUE_HEADER_SINGLE : -elants_i2c_event (ts, &ts->buf[HEADER_SIZE ]); +elants_i2c_event (ts, &ts->buf[HEADER_SIZE ], + ts->buf[FW_HDR_LENGTH ]);break ;case QUEUE_HEADER_NORMAL :
@@ -1001,17 +1014,18 @@ static irqreturn_t elants_i2c_irq(int irq, void *_dev) } report_len = ts->buf[FW_HDR_LENGTH ] / report_count; -if (report_len !=PACKET_SIZE ) { +if (report_len !=PACKET_SIZE && + report_len !=PACKET_SIZE_OLD ) {dev_err (&client->dev, -"mismatching report length: %*ph\n" , +"unsupported report length: %*ph\n" ,HEADER_SIZE , ts->buf);break ; }for (i =0 ; i < report_count; i++) {u8 *buf = ts->buf +HEADER_SIZE + - i *PACKET_SIZE ; -elants_i2c_event (ts, buf); + i * report_len; +elants_i2c_event (ts, buf, report_len); }break ;
Signature · 1 line
2.20.1
PATCH v5 3/10 input: elants: remove unused axes
In reply to Michał MirosławDriver only ever reports MT events and input_mt_init_slots() sets up emulated axes already. Clear the capabilities not generated directly and move MT axes setup, so they are visible by input_mt_init_slots().
---
v4: reword commitmsg; reorder axis setup
--- drivers/input/touchscreen/elants_i2c.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
drivers/input/touchscreen/elants_i2c.c +8 -18
@@ -1319,25 +1319,7 @@ static int elants_i2c_probe(struct i2c_client *client, ts->input->name ="Elan Touchscreen" ; ts->input->id.bustype =BUS_I2C ; -__set_bit (BTN_TOUCH , ts->input->keybit); -__set_bit (EV_ABS , ts->input->evbit); -__set_bit (EV_KEY , ts->input->evbit); - -/* Single touch input params setup */ -input_set_abs_params (ts->input,ABS_X ,0 , ts->x_max,0 ,0 ); -input_set_abs_params (ts->input,ABS_Y ,0 , ts->y_max,0 ,0 ); -input_set_abs_params (ts->input,ABS_PRESSURE ,0 ,255 ,0 ,0 ); -input_abs_set_res (ts->input,ABS_X , ts->x_res); -input_abs_set_res (ts->input,ABS_Y , ts->y_res); -/* Multitouch input params setup */ - error =input_mt_init_slots (ts->input,MAX_CONTACT_NUM , -INPUT_MT_DIRECT |INPUT_MT_DROP_UNUSED ); -if (error) { -dev_err (&client->dev, -"failed to initialize MT slots: %d\n" , error); -return error; - }input_set_abs_params (ts->input,ABS_MT_POSITION_X ,0 , ts->x_max,0 ,0 );input_set_abs_params (ts->input,ABS_MT_POSITION_Y ,0 , ts->y_max,0 ,0 );
@@ -1349,6 +1331,14 @@ static int elants_i2c_probe(struct i2c_client *client,input_abs_set_res (ts->input,ABS_MT_POSITION_Y , ts->y_res);input_abs_set_res (ts->input,ABS_MT_TOUCH_MAJOR ,1 ); + error =input_mt_init_slots (ts->input,MAX_CONTACT_NUM , +INPUT_MT_DIRECT |INPUT_MT_DROP_UNUSED ); +if (error) { +dev_err (&client->dev, +"failed to initialize MT slots: %d\n" , error); +return error; + } + error =input_register_device (ts->input);if (error) { dev_err(&client->dev,
Signature · 1 line
2.20.1
Re: [PATCH v5 03/10] input: elants: remove unused axes
26.04.2020 20:47, Michał Mirosław пишет:
Quoted 10 lines
Driver only ever reports MT events and
input_mt_init_slots()sets up emulated axes already. Clear the capabilities not generated directly and move MT axes setup, so they are visible byinput_mt_init_slots().Signed-off-by Michał Mirosław <[email protected]>Reviewed-by Dmitry Osipenko <[email protected]>Tested-by Dmitry Osipenko <[email protected]>---
v4: reword commitmsg; reorder axis setup
---
v5 applies cleanly to the current linux-next and everything working fine on both Ubuntu 12.04 and 20.04! Thank you very much :)
Re: [PATCH v5 03/10] input: elants: remove unused axes
In reply to Michał MirosławQuoted 7 lines · Michał Mirosław
Driver only ever reports MT events and
input_mt_init_slots()sets up emulated axes already. Clear the capabilities not generated directly and move MT axes setup, so they are visible byinput_mt_init_slots().Signed-off-by Michał Mirosław <[email protected]>Reviewed-by Dmitry Osipenko <[email protected]>Tested-by Dmitry Osipenko <[email protected]>
Applied, thank you.
Signature · 1 line
Dmitry
PATCH v5 4/10 input: elants: override touchscreen info with DT properties
In reply to Michał MirosławAllow overriding of information from hardware and support additional common DT properties like axis inversion. This is required for eg. Nexus 7 and TF300T where the programmed values in firmware differ from reality.
---
v5: rebase against dtor/input/for-linus
--- drivers/input/touchscreen/elants_i2c.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/input/touchscreen/elants_i2c.c +5 -2
@@ -33,6 +33,7 @@#include <linux/slab.h> #include <linux/firmware.h> #include <linux/input/mt.h> +#include <linux/input/touchscreen.h> #include <linux/acpi.h> #include <linux/of.h> #include <linux/gpio/consumer.h>
@@ -152,6 +153,7 @@ struct elants_data {unsigned int y_res;unsigned int x_max;unsigned int y_max; +struct touchscreen_properties prop;enum elants_state state;enum elants_iap_mode iap_mode;
@@ -901,8 +903,7 @@ static void elants_i2c_mt_event(struct elants_data *ts, u8 *buf,input_mt_slot (input, i);input_mt_report_slot_state (input, tool_type, true); -input_event (input,EV_ABS ,ABS_MT_POSITION_X , x); -input_event (input,EV_ABS ,ABS_MT_POSITION_Y , y); +touchscreen_report_pos (input, &ts->prop, x, y, true);input_event (input,EV_ABS ,ABS_MT_PRESSURE , p);input_event (input,EV_ABS ,ABS_MT_TOUCH_MAJOR , w);
@@ -1331,6 +1332,8 @@ static int elants_i2c_probe(struct i2c_client *client,input_abs_set_res (ts->input,ABS_MT_POSITION_Y , ts->y_res);input_abs_set_res (ts->input,ABS_MT_TOUCH_MAJOR ,1 ); +touchscreen_parse_properties (ts->input, true, &ts->prop); + error =input_mt_init_slots (ts->input,MAX_CONTACT_NUM ,INPUT_MT_DIRECT |INPUT_MT_DROP_UNUSED );if (error) {
Signature · 1 line
2.20.1
Re: [PATCH v5 04/10] input: elants: override touchscreen info with DT properties
Quoted 8 lines · Michał Mirosław
Allow overriding of information from hardware and support additional common DT properties like axis inversion. This is required for eg. Nexus 7 and TF300T where the programmed values in firmware differ from reality.
Signed-off-by Dmitry Osipenko <[email protected]>[moved "prop" before DMA buffer]Signed-off-by Michał Mirosław <[email protected]>
Applied, thank you.
Signature · 1 line
Dmitry
PATCH v5 5/10 input: elants: refactor elants_i2c_execute_command()
In reply to Michał MirosławApply some DRY-ing to elants_i2c_execute_command() callers. This pulls polling and error printk()s into a single function.
---
v4: return 0 on success; use %pe for error code
--- drivers/input/touchscreen/elants_i2c.c | 189 +++++++++++++------------ 1 file changed, 96 insertions(+), 93 deletions(-)
drivers/input/touchscreen/elants_i2c.c +96 -93
@@ -207,7 +207,8 @@ static int elants_i2c_read(struct i2c_client *client, void *data, size_t size)static int elants_i2c_execute_command (struct i2c_client *client,const u8 *cmd,size_t cmd_size, -u8 *resp,size_t resp_size) +u8 *resp,size_t resp_size, +int retries,const char *cmd_name) {struct i2c_msg msgs[2 ];int ret;
@@ -227,30 +228,55 @@ static int elants_i2c_execute_command(struct i2c_client *client,break ;default : -dev_err (&client->dev,"%s: invalid command %*ph\n" , - __func__, (int )cmd_size, cmd); +dev_err (&client->dev,"(%s): invalid command: %*ph\n" , + cmd_name, (int )cmd_size, cmd);return -EINVAL ; } - msgs[0 ].addr = client->addr; - msgs[0 ].flags = client->flags &I2C_M_TEN ; - msgs[0 ].len = cmd_size; - msgs[0 ].buf = (u8 *)cmd; +for (;;) { + msgs[0 ].addr = client->addr; + msgs[0 ].flags = client->flags &I2C_M_TEN ; + msgs[0 ].len = cmd_size; + msgs[0 ].buf = (u8 *)cmd; - msgs[1 ].addr = client->addr; - msgs[1 ].flags = client->flags &I2C_M_TEN ; - msgs[1 ].flags |=I2C_M_RD ; - msgs[1 ].len = resp_size; - msgs[1 ].buf = resp; + msgs[1 ].addr = client->addr; + msgs[1 ].flags = client->flags &I2C_M_TEN ; + msgs[1 ].flags |=I2C_M_RD ; + msgs[1 ].len = resp_size; + msgs[1 ].buf = resp; - ret =i2c_transfer (client->adapter, msgs,ARRAY_SIZE (msgs)); -if (ret <0 ) -return ret; + ret =i2c_transfer (client->adapter, msgs,ARRAY_SIZE (msgs)); +if (ret <0 ) { +if (--retries >0 ) { +dev_dbg (&client->dev, +"(%s) I2C transfer failed: %pe (retrying)\n" , + cmd_name,ERR_PTR (ret)); +continue ; + } -if (ret !=ARRAY_SIZE (msgs) || resp[FW_HDR_TYPE ] != expected_response) -return -EIO ; +dev_err (&client->dev, +"(%s) I2C transfer failed: %pe\n" , + cmd_name,ERR_PTR (ret)); +return ret; + } -return 0 ; +if (ret !=ARRAY_SIZE (msgs) || + resp[FW_HDR_TYPE ] != expected_response) { +if (--retries >0 ) { +dev_dbg (&client->dev, +"(%s) unexpected response: %*ph (retrying)\n" , + cmd_name, ret, resp); +continue ; + } + +dev_err (&client->dev, +"(%s) unexpected response: %*ph\n" , + cmd_name, ret, resp); +return -EIO ; + } + +return 0 ; + } }static int elants_i2c_calibrate (struct elants_data *ts)
@@ -323,27 +349,21 @@ static u16 elants_i2c_parse_version(u8 *buf)static int elants_i2c_query_hw_version (struct elants_data *ts) {struct i2c_client *client = ts->client; -int error, retry_cnt; +int retry_cnt =MAX_RETRIES ;const u8 cmd[] = {CMD_HEADER_READ ,E_ELAN_INFO_FW_ID ,0x00 ,0x01 };u8 resp[HEADER_SIZE ]; +int err; -for (retry_cnt =0 ; retry_cnt <MAX_RETRIES ; retry_cnt++) { - error =elants_i2c_execute_command (client, cmd,sizeof (cmd), - resp,sizeof (resp)); -if (!error) { - ts->hw_version =elants_i2c_parse_version (resp); -if (ts->hw_version !=0xffff ) -return 0 ; - } +while (retry_cnt--) { + err =elants_i2c_execute_command (client, cmd,sizeof (cmd), + resp,sizeof (resp),1 , +"read fw id" ); +if (err <0 ) +return err; -dev_dbg (&client->dev,"read fw id error=%d, buf=%*phC\n" , - error, (int )sizeof (resp), resp); - } - -if (error) { -dev_err (&client->dev, -"Failed to read fw id: %d\n" , error); -return error; + ts->hw_version =elants_i2c_parse_version (resp); +if (ts->hw_version !=0xffff ) +return 0 ; }dev_err (&client->dev,"Invalid fw id: %#04x\n" , ts->hw_version);
@@ -354,26 +374,27 @@ static int elants_i2c_query_hw_version(struct elants_data *ts)static int elants_i2c_query_fw_version (struct elants_data *ts) {struct i2c_client *client = ts->client; -int error, retry_cnt; +int retry_cnt =MAX_RETRIES ;const u8 cmd[] = {CMD_HEADER_READ ,E_ELAN_INFO_FW_VER ,0x00 ,0x01 };u8 resp[HEADER_SIZE ]; +int err; -for (retry_cnt =0 ; retry_cnt <MAX_RETRIES ; retry_cnt++) { - error =elants_i2c_execute_command (client, cmd,sizeof (cmd), - resp,sizeof (resp)); -if (!error) { - ts->fw_version =elants_i2c_parse_version (resp); -if (ts->fw_version !=0x0000 && - ts->fw_version !=0xffff ) -return 0 ; - } +while (retry_cnt--) { + err =elants_i2c_execute_command (client, cmd,sizeof (cmd), + resp,sizeof (resp),1 , +"read fw version" ); +if (err <0 ) +return err; -dev_dbg (&client->dev,"read fw version error=%d, buf=%*phC\n" , - error, (int )sizeof (resp), resp); + ts->fw_version =elants_i2c_parse_version (resp); +if (ts->fw_version !=0x0000 && ts->fw_version !=0xffff ) +return 0 ; + +dev_dbg (&client->dev,"(read fw version) resp %*phC\n" , + (int )sizeof (resp), resp); } -dev_err (&client->dev, -"Failed to read fw version or fw version is invalid\n" ); +dev_err (&client->dev,"Invalid fw ver: %#04x\n" , ts->fw_version);return -EINVAL ; }
@@ -381,25 +402,20 @@ static int elants_i2c_query_fw_version(struct elants_data *ts)static int elants_i2c_query_test_version (struct elants_data *ts) {struct i2c_client *client = ts->client; -int error, retry_cnt; +int error;u16 version;const u8 cmd[] = {CMD_HEADER_READ ,E_ELAN_INFO_TEST_VER ,0x00 ,0x01 };u8 resp[HEADER_SIZE ]; -for (retry_cnt =0 ; retry_cnt <MAX_RETRIES ; retry_cnt++) { - error =elants_i2c_execute_command (client, cmd,sizeof (cmd), - resp,sizeof (resp)); -if (!error) { - version =elants_i2c_parse_version (resp); - ts->test_version = version >>8 ; - ts->solution_version = version &0xff ; + error =elants_i2c_execute_command (client, cmd,sizeof (cmd), + resp,sizeof (resp),MAX_RETRIES , +"read test version" ); +if (!error) { + version =elants_i2c_parse_version (resp); + ts->test_version = version >>8 ; + ts->solution_version = version &0xff ; -return 0 ; - } - -dev_dbg (&client->dev, -"read test version error rc=%d, buf=%*phC\n" , - error, (int )sizeof (resp), resp); +return 0 ; }dev_err (&client->dev,"Failed to read test version\n" );
@@ -416,13 +432,10 @@ static int elants_i2c_query_bc_version(struct elants_data *ts)int error; error =elants_i2c_execute_command (client, cmd,sizeof (cmd), - resp,sizeof (resp)); -if (error) { -dev_err (&client->dev, -"read BC version error=%d, buf=%*phC\n" , - error, (int )sizeof (resp), resp); + resp,sizeof (resp),1 , +"read BC version" ); +if (error)return error; - } version =elants_i2c_parse_version (resp); ts->bc_version = version >>8 ;
@@ -454,12 +467,10 @@ static int elants_i2c_query_ts_info(struct elants_data *ts) error =elants_i2c_execute_command (client, get_resolution_cmd,sizeof (get_resolution_cmd), - resp,sizeof (resp)); -if (error) { -dev_err (&client->dev,"get resolution command failed: %d\n" , - error); + resp,sizeof (resp),1 , +"get resolution" ); +if (error)return error; - } rows = resp[2 ] + resp[6 ] + resp[10 ]; cols = resp[3 ] + resp[7 ] + resp[11 ];
@@ -467,36 +478,29 @@ static int elants_i2c_query_ts_info(struct elants_data *ts)/* Process mm_to_pixel information */ error =elants_i2c_execute_command (client, get_osr_cmd,sizeof (get_osr_cmd), - resp,sizeof (resp)); -if (error) { -dev_err (&client->dev,"get osr command failed: %d\n" , - error); + resp,sizeof (resp),1 ,"get osr" ); +if (error)return error; - } osr = resp[3 ]; error =elants_i2c_execute_command (client, get_physical_scan_cmd,sizeof (get_physical_scan_cmd), - resp,sizeof (resp)); -if (error) { -dev_err (&client->dev,"get physical scan command failed: %d\n" , - error); + resp,sizeof (resp),1 , +"get physical scan" ); +if (error)return error; - } phy_x =get_unaligned_be16 (&resp[2 ]); error =elants_i2c_execute_command (client, get_physical_drive_cmd,sizeof (get_physical_drive_cmd), - resp,sizeof (resp)); -if (error) { -dev_err (&client->dev,"get physical drive command failed: %d\n" , - error); + resp,sizeof (resp),1 , +"get physical drive" ); +if (error)return error; - } phy_y =get_unaligned_be16 (&resp[2 ]);
@@ -651,11 +655,10 @@ static int elants_i2c_validate_remark_id(struct elants_data *ts,/* Compare TS Remark ID and FW Remark ID */ error =elants_i2c_execute_command (client, cmd,sizeof (cmd), - resp,sizeof (resp)); -if (error) { -dev_err (&client->dev,"failed to query Remark ID: %d\n" , error); + resp,sizeof (resp), +1 ,"read Remark ID" ); +if (error <0 )return error; - } ts_remark_id =get_unaligned_be16 (&resp[3 ]);
Signature · 1 line
2.20.1
Re: [PATCH v5 05/10] input: elants: refactor elants_i2c_execute_command()
26.04.2020 20:47, Michał Mirosław пишет:
Quoted 7 lines
Apply some DRY-ing to
elants_i2c_execute_command()callers. This pulls polling and error printk()s into a single function.Signed-off-by Michał Mirosław <[email protected]>---
v4: return 0 on success; use %pe for error code
---
Hello Michał,
This patch needs to be rebased on a newer linux-next once again :)
Re: [PATCH v5 05/10] input: elants: refactor elants_i2c_execute_command()
In reply to Michał MirosławQuoted 4 lines · Michał Mirosław
Apply some DRY-ing to
elants_i2c_execute_command()callers. This pulls polling and error printk()s into a single function.Signed-off-by Michał Mirosław <[email protected]>
Applied, thank you.
Signature · 1 line
Dmitry
PATCH v5 6/10 input: elants: read touchscreen size for EKTF3624
In reply to Michał MirosławEKTF3624 as present in Asus TF300T tablet has touchscreen size encoded in different registers.
--- drivers/input/touchscreen/elants_i2c.c | 82 ++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 5 deletions(-)
drivers/input/touchscreen/elants_i2c.c +77 -5
@@ -35,7 +35,7 @@#include <linux/input/mt.h> #include <linux/input/touchscreen.h> #include <linux/acpi.h> -#include <linux/of.h> +#include <linux/of_device.h> #include <linux/gpio/consumer.h> #include <linux/regulator/consumer.h> #include <asm/unaligned.h>
@@ -43,6 +43,10 @@/* Device, Driver information */ #define DEVICE_NAME "elants_i2c" +/* Device IDs */ +#define EKTH3500 0 +#define EKTF3624 1 +/* Convert from rows or columns into resolution */ #define ELAN_TS_RESOLUTION (n, m) (((n) - 1) * (m))
@@ -166,6 +170,7 @@ struct elants_data {bool wake_irq_enabled;bool keep_power_in_suspend; +u8 chip_id;/* Must be last to be used for DMA operations */ u8 buf[MAX_PACKET_SIZE ]____cacheline_aligned ;
@@ -444,7 +449,58 @@ static int elants_i2c_query_bc_version(struct elants_data *ts)return 0 ; } -static int elants_i2c_query_ts_info (struct elants_data *ts) +static int elants_i2c_query_ts_info_ektf (struct elants_data *ts) +{ +struct i2c_client *client = ts->client; +int error; +u8 resp[4 ]; +u16 phy_x, phy_y; +const u8 get_xres_cmd[] = { +CMD_HEADER_READ ,E_INFO_X_RES ,0x00 ,0x00 + }; +const u8 get_yres_cmd[] = { +CMD_HEADER_READ ,E_INFO_Y_RES ,0x00 ,0x00 + }; + +/* Get X/Y size in mm */ + error =elants_i2c_execute_command (client, get_xres_cmd, +sizeof (get_xres_cmd), + resp,sizeof (resp),1 , +"get X size" ); +if (error) +return error; + + phy_x = resp[2 ] | ((resp[3 ] &0xF0 ) <<4 ); + + error =elants_i2c_execute_command (client, get_yres_cmd, +sizeof (get_yres_cmd), + resp,sizeof (resp),1 , +"get Y size" ); +if (error) +return error; + + phy_y = resp[2 ] | ((resp[3 ] &0xF0 ) <<4 ); + +if (!phy_x || !phy_y) { +dev_warn (&client->dev, +"invalid size data: %d x %d mm\n" , + phy_x, phy_y); +return 0 ; + } + +dev_dbg (&client->dev,"phy_x=%d, phy_y=%d\n" , phy_x, phy_y); + +/* calculate resolution from size */ + ts->x_max =2240 -1 ; + ts->x_res =DIV_ROUND_CLOSEST (ts->prop.max_x, phy_x); + + ts->y_max =1408 -1 ; + ts->y_res =DIV_ROUND_CLOSEST (ts->prop.max_y, phy_y); + +return 0 ; +} + +static int elants_i2c_query_ts_info_ekth (struct elants_data *ts) {struct i2c_client *client = ts->client;int error;
@@ -595,8 +651,20 @@ static int elants_i2c_initialize(struct elants_data *ts) error =elants_i2c_query_fw_version (ts);if (!error) error =elants_i2c_query_test_version (ts); -if (!error) - error =elants_i2c_query_ts_info (ts); + +switch (ts->chip_id) { +case EKTH3500 : +if (!error) + error =elants_i2c_query_ts_info_ekth (ts); +break ; +case EKTF3624 : +if (!error) + error =elants_i2c_query_ts_info_ektf (ts); +break ; +default : +unreachable (); +break ; + }if (error) ts->iap_mode =ELAN_IAP_RECOVERY ;
@@ -1252,6 +1320,9 @@ static int elants_i2c_probe(struct i2c_client *client, ts->client = client;i2c_set_clientdata (client, ts); +if (client->dev.of_node) + ts->chip_id = (uintptr_t )of_device_get_match_data (&client->dev); + ts->vcc33 =devm_regulator_get (&client->dev,"vcc33" );if (IS_ERR (ts->vcc33)) { error =PTR_ERR (ts->vcc33);
@@ -1480,7 +1551,8 @@ MODULE_DEVICE_TABLE(acpi, elants_acpi_id);#ifdef CONFIG_OF static const struct of_device_id elants_of_match[] = { - { .compatible ="elan,ekth3500" }, + { .compatible ="elan,ekth3500" , .data = (void *)EKTH3500 }, + { .compatible ="elan,ektf3624" , .data = (void *)EKTF3624 }, {/* sentinel */ } };MODULE_DEVICE_TABLE (of, elants_of_match);
Signature · 1 line
2.20.1
PATCH v5 7/10 input: elants: support 0x66 reply opcode for reporting touches
In reply to Michał MirosławFrom: Dmitry Osipenko <[email protected]>
eKTF3624 touchscreen firmware uses two variants of the reply opcodes for reporting touch events: one is 0x63 (used by older firmware) and other is 0x66 (used by newer firmware). The 0x66 variant is equal to 0x63 of eKTH3500, while 0x63 needs small adjustment of the touch pressure value.
Nexus 7 tablet device has eKTF3624 touchscreen and it uses 0x66 opcode for reporting touch events, let's support it now. Other devices, eg. ASUS TF300T, use 0x63.
Note: CMD_HEADER_REK is used for replying to calibration requests, it has the same 0x66 opcode number which eKTF3624 uses for reporting touches. The calibration replies are handled separately from the the rest of the commands in the driver by entering into ELAN_WAIT_RECALIBRATION state and thus this change shouldn't change the old behavior.
--- drivers/input/touchscreen/elants_i2c.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/input/touchscreen/elants_i2c.c +10 -1
@@ -61,6 +61,15 @@#define QUEUE_HEADER_NORMAL 0X63#define QUEUE_HEADER_WAIT 0x64 +/* +* Depending on firmware version, eKTF3624 touchscreens may utilize one of +* these opcodes for the touch events: 0x63 and 0x66. The 0x63 is used by +* older firmware version and differs from 0x66 such that touch pressure +* value needs to be adjusted. The 0x66 opcode of newer firmware is equal +* to 0x63 of eKTH3500. +*/ +#define QUEUE_HEADER_NORMAL2 0x66 +/* Command header definition */ #define CMD_HEADER_WRITE 0x54#define CMD_HEADER_READ 0x53
@@ -1057,7 +1066,6 @@ static irqreturn_t elants_i2c_irq(int irq, void *_dev)switch (ts->buf[FW_HDR_TYPE ]) {case CMD_HEADER_HELLO :case CMD_HEADER_RESP : -case CMD_HEADER_REK :break ;case QUEUE_HEADER_WAIT :
@@ -1077,6 +1085,7 @@ static irqreturn_t elants_i2c_irq(int irq, void *_dev)break ;case QUEUE_HEADER_NORMAL : +case QUEUE_HEADER_NORMAL2 : report_count = ts->buf[FW_HDR_COUNT ];if (report_count ==0 || report_count >3 ) { dev_err(&client->dev,
Signature · 1 line
2.20.1
Dmitry Torokhov
maintainerRe: [PATCH v5 07/10] input: elants: support 0x66 reply opcode for reporting touches
Quoted 11 lines · Michał Mirosław
From: Dmitry Osipenko <[email protected]>
eKTF3624 touchscreen firmware uses two variants of the reply opcodes for reporting touch events: one is
0x63(used by older firmware) and other is0x66(used by newer firmware). The0x66variant is equal to0x63of eKTH3500, while0x63needs small adjustment of the touch pressure value.Nexus 7 tablet device has eKTF3624 touchscreen and it uses
0x66opcode for reporting touch events, let's support it now. Other devices, eg. ASUS TF300T, use0x63.
Quoted 5 lines
Note:
CMD_HEADER_REKis used for replying to calibration requests, it has the same0x66opcode number which eKTF3624 uses for reporting touches. The calibration replies are handled separately from the the rest of the commands in the driver by entering intoELAN_WAIT_RECALIBRATIONstate and thus this change shouldn't change the old behavior.
Is it possible to know what format a device will use by querying it at probe time?
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH v5 07/10] input: elants: support 0x66 reply opcode for reporting touches
18.05.2020 07:05, Dmitry Torokhov пишет:
Quoted 12 lines · Michał Mirosław
Quoted 11 lines
From: Dmitry Osipenko <[email protected]>
eKTF3624 touchscreen firmware uses two variants of the reply opcodes for reporting touch events: one is
0x63(used by older firmware) and other is0x66(used by newer firmware). The0x66variant is equal to0x63of eKTH3500, while0x63needs small adjustment of the touch pressure value.Nexus 7 tablet device has eKTF3624 touchscreen and it uses
0x66opcode for reporting touch events, let's support it now. Other devices, eg. ASUS TF300T, use0x63.
Quoted 8 lines
Quoted 5 lines
Note:
CMD_HEADER_REKis used for replying to calibration requests, it has the same0x66opcode number which eKTF3624 uses for reporting touches. The calibration replies are handled separately from the the rest of the commands in the driver by entering intoELAN_WAIT_RECALIBRATIONstate and thus this change shouldn't change the old behavior.Is it possible to know what format a device will use by querying it at probe time?
I guess only somebody from Elan could answer this question. AFAIK, neither touchscreen firmware sources nor technical documentation aren't publicly available.
Downstream kernel driver is the only source of information in our case and it does the same thing as we do in this patch.
PATCH v5 8/10 dt-bindings: input: elants-i2c: Document common touchscreen properties
In reply to Michał MirosławFrom: Dmitry Osipenko <[email protected]>
Document support of the common touchscreen properties.
--- Documentation/devicetree/bindings/input/elants_i2c.txt | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/input/elants_i2c.txt +4 -0
@@ -14,9 +14,13 @@ Optional properties: - reset-gpios: reset gpio the chip is connected to. - vcc33-supply: a phandle for the regulator supplying 3.3V power. - vccio-supply: a phandle for the regulator supplying IO power. +- see [2] for additional properties + +For additional optional properties see: touchscreen.txt [0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt [1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt +[2]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt Example: &i2c1 {
Signature · 1 line
2.20.1
PATCH v5 9/10 dt-bindings: input: elants-i2c: Document eKTF3624
In reply to Michał MirosławFrom: Dmitry Osipenko <[email protected]>
The eKTF3624 hardware is similar to eKTH3500.
--- Documentation/devicetree/bindings/input/elants_i2c.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/input/elants_i2c.txt +1 -1
@@ -1,7 +1,7 @@ Elantech I2C Touchscreen Required properties: -- compatible: must be "elan,ekth3500". +- compatible: must be "elan,ekth3500" or "elan,ektf3624". - reg: I2C address of the chip. - interrupts: interrupt to which the chip is connected (see interrupt binding[0]).
Signature · 1 line
2.20.1
PATCH v5 10/10 dt-bindings: input: touchscreen: elants_i2c: convert to YAML
In reply to Michał MirosławFrom: David Heidelberg <[email protected]>
Convert elants_i2c.txt DT binding to YAML and put into correct directory.
--- .../devicetree/bindings/input/elants_i2c.txt | 38 ---------- .../input/touchscreen/elan,elants_i2c.yaml | 69 +++++++++++++++++++ 2 files changed, 69 insertions(+), 38 deletions(-)
Documentation/devicetree/bindings/input/elants_i2c.txt deleted +0 -38
@@ -1,38 +0,0 @@ -Elantech I2C Touchscreen - -Required properties: -- compatible: must be "elan,ekth3500" or "elan,ektf3624". -- reg: I2C address of the chip. -- interrupts: interrupt to which the chip is connected (see interrupt - binding[0]). - -Optional properties: -- wakeup-source: touchscreen can be used as a wakeup source. -- pinctrl-names: should be "default" (see pinctrl binding [1]). -- pinctrl-0: a phandle pointing to the pin settings for the device (see - pinctrl binding [1]). -- reset-gpios: reset gpio the chip is connected to. -- vcc33-supply: a phandle for the regulator supplying 3.3V power. -- vccio-supply: a phandle for the regulator supplying IO power. -- see [2] for additional properties - -For additional optional properties see: touchscreen.txt - -[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt -[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt -[2]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt - -Example: - &i2c1 { - /* ... */ - - touchscreen@10 { - compatible = "elan,ekth3500"; - reg = <0x10>; - interrupt-parent = <&gpio4>; - interrupts = <0x0 IRQ_TYPE_EDGE_FALLING>; - wakeup-source; - }; - - /* ... */ - };
Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.20.1
26.04.2020 20:47, Michał Mirosław пишет:
Quoted 4 lines
This series cleans up the driver a bit and implements changes needed to support EKTF3624-based touchscreen used in Asus TF300T and similar Tegra3-based tablets.
Quoted 8 lines
---
v2: extended with Dmitry's patches (replaced v1 patches 3 and 4)
v3: rebased for v5.7-rc1
v4: rebased onto v5.7-rc2+ (current Linus' master)
update "remove unused axes" and "refactor
elants_i2c_execute_command()" patches after review
add David's patch converting DT binding to YAML
v5: rebased onto dtor/input/for-linus
Hello Johnny,
Could you please help with reviewing this series? Thanks in advance!