Skip to contentSkip to conversation

Input: novatek-nvt-ts - drop wake_type check

PATCH In review Gianluca Boiano 2 participants 2 messages Jan 22 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20260121-fervent-wren-1730d5@quoll

#1 lore raw

PATCH v3 1/1 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 hardcoded 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.

---
Changes in v3:
- Completely reworked per Hans de Goede's suggestion: instead of adding a new compatible for the e7t variant, simply drop the wake_type check entirely since it serves no functional purpose
- Dropped dt-bindings patch (no longer needed)

Changes in v2:
- Removed Closes: tag referencing downstream repository

 drivers/input/touchscreen/novatek-nvt-ts.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/input/touchscreen/novatek-nvt-ts.c +0 -5
index 44b58e0dc1ad..3e6e2ee0ba8f 100644
@@ -27,7 +27,6 @@
 #define NVT_TS_PARAMS_MAX_TOUCH		0x09
 #define NVT_TS_PARAMS_MAX_BUTTONS	0x0a
 #define NVT_TS_PARAMS_IRQ_TYPE		0x0b
-#define NVT_TS_PARAMS_WAKE_TYPE		0x0c
 #define NVT_TS_PARAMS_CHIP_ID		0x0e
 #define NVT_TS_PARAMS_SIZE		0x0f
 
@@ -49,7 +48,6 @@ static const int nvt_ts_irq_type[4] = {
 };
 
 struct nvt_ts_i2c_chip_data {
-	u8 wake_type;
 	u8 chip_id;
 };
 
@@ -261,7 +259,6 @@ static int nvt_ts_probe(struct i2c_client *client)
 	if (width > NVT_TS_MAX_SIZE || height >= NVT_TS_MAX_SIZE ||
 	    data->max_touches > NVT_TS_MAX_TOUCHES ||
 	    irq_type >= ARRAY_SIZE(nvt_ts_irq_type) ||
-	    data->buf[NVT_TS_PARAMS_WAKE_TYPE] != chip->wake_type ||
 	    data->buf[NVT_TS_PARAMS_CHIP_ID] != chip->chip_id) {
 		dev_err(dev, "Unsupported touchscreen parameters: %*ph\n",
 			NVT_TS_PARAMS_SIZE, data->buf);
@@ -314,12 +311,10 @@ static int nvt_ts_probe(struct i2c_client *client)
 }
 
 static const struct nvt_ts_i2c_chip_data nvt_nt11205_ts_data = {
-	.wake_type = 0x05,
 	.chip_id = 0x05,
 };
 
 static const struct nvt_ts_i2c_chip_data nvt_nt36672a_ts_data = {
-	.wake_type = 0x01,
 	.chip_id = 0x08,
 };
 
Signature · 1 line
2.52.0
maintainer
#2 lore raw
Quoted 10 lines · Gianluca Boiano

The wake_type parameter from touchscreen registers is not used for anything functional - the driver only validates that it matches a hardcoded 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.

I think this deserves "Suggested-by:" tag. I'll add it unless there are objections...

Quoted 44 lines

---
Changes in v3:
- Completely reworked per Hans de Goede's suggestion: instead of adding a new compatible for the e7t variant, simply drop the wake_type check entirely since it serves no functional purpose
- Dropped dt-bindings patch (no longer needed)

Changes in v2:
- Removed Closes: tag referencing downstream repository

 drivers/input/touchscreen/novatek-nvt-ts.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/input/touchscreen/novatek-nvt-ts.c +0 -3
index 44b58e0dc1ad..3e6e2ee0ba8f 100644
@@ -27,7 +27,6 @@
 #define NVT_TS_PARAMS_MAX_TOUCH		0x09
 #define NVT_TS_PARAMS_MAX_BUTTONS	0x0a
 #define NVT_TS_PARAMS_IRQ_TYPE		0x0b
-#define NVT_TS_PARAMS_WAKE_TYPE		0x0c
 #define NVT_TS_PARAMS_CHIP_ID		0x0e
 #define NVT_TS_PARAMS_SIZE		0x0f
 
@@ -49,7 +48,6 @@ static const int nvt_ts_irq_type[4] = {
 };
 
 struct nvt_ts_i2c_chip_data {
-	u8 wake_type;
 	u8 chip_id;
 };
 
@@ -261,7 +259,6 @@ static int nvt_ts_probe(struct i2c_client *client)
 	if (width > NVT_TS_MAX_SIZE || height >= NVT_TS_MAX_SIZE ||
 	    data->max_touches > NVT_TS_MAX_TOUCHES ||
 	    irq_type >= ARRAY_SIZE(nvt_ts_irq_type) ||
-	    data->buf[NVT_TS_PARAMS_WAKE_TYPE] != chip->wake_type ||
 	    data->buf[NVT_TS_PARAMS_CHIP_ID] != chip->chip_id) {
 		dev_err(dev, "Unsupported touchscreen parameters: %*ph\n",
 			NVT_TS_PARAMS_SIZE, data->buf);
@@ -314,12 +311,10 @@ static int nvt_ts_probe(struct i2c_client *client)
 }
 

drivers/input/touchscreen/novatek-nvt-ts.c static int nvt_ts_probe(struct i2c_client *client) · line 320

Quoted 10 lines
drivers/input/touchscreen/novatek-nvt-ts.c +0 -2
 static const struct nvt_ts_i2c_chip_data nvt_nt11205_ts_data = {
-	.wake_type = 0x05,
 	.chip_id = 0x05,
 };
 
 static const struct nvt_ts_i2c_chip_data nvt_nt36672a_ts_data = {
-	.wake_type = 0x01,
 	.chip_id = 0x08,
 };
 

Thanks.

Signature · 1 line
Dmitry