Skip to content

Commit

Permalink
input: edt-ft5x06: Include I2C details in names for the devices
Browse files Browse the repository at this point in the history
libinput uses the input device name alone. If you have two
identical input devices, then there is no way to differentiate
between them, and in the case of touchscreens that means no
way to associate them with the appropriate display device.

Add the I2C bus and address to the start of the input device
name so that the name is always unique within the system.

Signed-off-by: Dave Stevenson <[email protected]>
  • Loading branch information
6by9 committed Nov 22, 2023
1 parent 5a0aa24 commit 23c9761
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/input/touchscreen/edt-ft5x06.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
#define TOUCH_EVENT_RESERVED 0x03

#define EDT_NAME_LEN 23
#define EDT_NAME_PREFIX_LEN 8
#define EDT_SWITCH_MODE_RETRIES 10
#define EDT_SWITCH_MODE_DELAY 5 /* msec */
#define EDT_RAW_DATA_RETRIES 100
Expand Down Expand Up @@ -134,7 +135,7 @@ struct edt_ft5x06_ts_data {
int max_support_points;
unsigned int known_ids;

char name[EDT_NAME_LEN];
char name[EDT_NAME_PREFIX_LEN + EDT_NAME_LEN];
char fw_version[EDT_NAME_LEN];
int init_td_status;

Expand Down Expand Up @@ -965,6 +966,9 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,
char *model_name = tsdata->name;
char *fw_version = tsdata->fw_version;

snprintf(model_name, EDT_NAME_PREFIX_LEN, "%s ", dev_name(&client->dev));
model_name += strlen(model_name);

/* see what we find if we assume it is a M06 *
* if we get less than EDT_NAME_LEN, we don't want
* to have garbage in there
Expand Down

0 comments on commit 23c9761

Please sign in to comment.