openwrt/target/linux/bcm27xx/patches-5.15/950-0589-input-edt-ft5x06-Only-look-at-the-number-of-points-r.patch
Álvaro Fernández Rojas 20ea6adbf1 bcm27xx: add support for linux v5.15
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B

Signed-off-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2022-05-17 15:11:22 +02:00

45 lines
1.4 KiB
Diff

From 066255aaae527ace73f85d698a6668a752785d1c Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Tue, 30 Nov 2021 17:28:50 +0000
Subject: [PATCH] input: edt-ft5x06: Only look at the number of points
reported
Register 0x02 in the FT5x06 is TD_STATUS containing the number
of valid touch points being reported.
Iterate over that number of points rather than all that are
supported on the device.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
drivers/input/touchscreen/edt-ft5x06.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -205,6 +205,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int
unsigned int active_ids = 0, known_ids = tsdata->known_ids;
long released_ids;
int b = 0;
+ unsigned int num_points;
switch (tsdata->version) {
case EDT_M06:
@@ -252,9 +253,15 @@ static irqreturn_t edt_ft5x06_ts_isr(int
if (!edt_ft5x06_ts_check_crc(tsdata, rdbuf, datalen))
goto out;
+ num_points = tsdata->max_support_points;
+ } else {
+ /* Register 2 is TD_STATUS, containing the number of touch
+ * points.
+ */
+ num_points = min(rdbuf[2] & 0xf, tsdata->max_support_points);
}
- for (i = 0; i < tsdata->max_support_points; i++) {
+ for (i = 0; i < num_points; i++) {
u8 *buf = &rdbuf[i * tplen + offset];
type = buf[0] >> 6;