Skip to content

Commit 7ff5745

Browse files
M0Rf30dtor
authored andcommitted
Input: novatek-nvt-ts - drop wake_type check
The wake_type parameter from touchscreen registers is not used for anything functional - the driver only validates that it matches a hard-coded expected value per chip variant. This causes probe to fail on touchscreens that report a different wake_type despite being otherwise compatible. Drop the wake_type check and the associated chip data member to allow the existing compatibles to work with more touchscreen variants. Signed-off-by: Gianluca Boiano <morf3089@gmail.com> Suggested-by: Hans de Goede <hansg@kernel.org> Link: https://patch.msgid.link/20260122001040.76869-1-morf3089@gmail.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent a53a6dd commit 7ff5745

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

drivers/input/touchscreen/novatek-nvt-ts.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#define NVT_TS_PARAMS_MAX_TOUCH 0x09
2828
#define NVT_TS_PARAMS_MAX_BUTTONS 0x0a
2929
#define NVT_TS_PARAMS_IRQ_TYPE 0x0b
30-
#define NVT_TS_PARAMS_WAKE_TYPE 0x0c
3130
#define NVT_TS_PARAMS_CHIP_ID 0x0e
3231
#define NVT_TS_PARAMS_SIZE 0x0f
3332

@@ -49,7 +48,6 @@ static const int nvt_ts_irq_type[4] = {
4948
};
5049

5150
struct nvt_ts_i2c_chip_data {
52-
u8 wake_type;
5351
u8 chip_id;
5452
};
5553

@@ -261,7 +259,6 @@ static int nvt_ts_probe(struct i2c_client *client)
261259
if (width > NVT_TS_MAX_SIZE || height >= NVT_TS_MAX_SIZE ||
262260
data->max_touches > NVT_TS_MAX_TOUCHES ||
263261
irq_type >= ARRAY_SIZE(nvt_ts_irq_type) ||
264-
data->buf[NVT_TS_PARAMS_WAKE_TYPE] != chip->wake_type ||
265262
data->buf[NVT_TS_PARAMS_CHIP_ID] != chip->chip_id) {
266263
dev_err(dev, "Unsupported touchscreen parameters: %*ph\n",
267264
NVT_TS_PARAMS_SIZE, data->buf);
@@ -314,12 +311,10 @@ static int nvt_ts_probe(struct i2c_client *client)
314311
}
315312

316313
static const struct nvt_ts_i2c_chip_data nvt_nt11205_ts_data = {
317-
.wake_type = 0x05,
318314
.chip_id = 0x05,
319315
};
320316

321317
static const struct nvt_ts_i2c_chip_data nvt_nt36672a_ts_data = {
322-
.wake_type = 0x01,
323318
.chip_id = 0x08,
324319
};
325320

0 commit comments

Comments
 (0)