Skip to content

input: goodix: Include I2C details in names for the devices #7506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
6by9 wants to merge 1 commit into
base: rpi-6.18.y
Choose a base branch
from
+7 −1
Open

input: goodix: Include I2C details in names for the devices #7506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion drivers/input/touchscreen/goodix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,10 @@ static int goodix_configure_dev(struct goodix_ts_data *ts)
return -ENOMEM;
}

ts->input_dev->name = "Goodix Capacitive TouchScreen";
snprintf(ts->name, GOODIX_NAME_MAX_LEN, "%s Goodix Capacitive TouchScreen",
dev_name(&ts->client->dev));

ts->input_dev->name = ts->name;
ts->input_dev->phys = "input/ts";
ts->input_dev->id.bustype = BUS_I2C;
ts->input_dev->id.vendor = 0x0416;
Expand Down
3 changes: 3 additions & 0 deletions drivers/input/touchscreen/goodix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
#define GOODIX_CONFIG_MAX_LENGTH 240
#define GOODIX_MAX_KEYS 7

#define GOODIX_NAME_MAX_LEN 38

enum goodix_irq_pin_access_method {
IRQ_PIN_ACCESS_NONE,
IRQ_PIN_ACCESS_GPIO,
Expand Down Expand Up @@ -90,6 +92,7 @@ struct goodix_ts_data {
int gpio_int_idx;
char id[GOODIX_ID_MAX_LEN + 1];
char cfg_name[64];
char name[GOODIX_NAME_MAX_LEN];
u16 version;
bool reset_controller_at_probe;
bool load_cfg_from_disk;
Expand Down
Loading