Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer fixes from Dmitry Torokhov:
"Just a few fixups to a couple of drivers"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elan_i2c - ignore signals when finishing updating firmware
Input: elan_i2c - clear INT before resetting controller
Input: atmel_mxt_ts - add T100 as a readable object
Input: edt-ft5x06 - increase allowed data range for threshold parameter
+20
-17
+1
-1
Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt
+1
-1
Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt
+1
-1
Documentation/input/devices/edt-ft5x06.rst
+1
-1
Documentation/input/devices/edt-ft5x06.rst
···
15
15
The driver allows configuration of the touch screen via a set of sysfs files:
16
16
17
17
/sys/class/input/eventX/device/device/threshold:
18
-
allows setting the "click"-threshold in the range from 20 to 80.
18
+
allows setting the "click"-threshold in the range from 0 to 80.
19
19
20
20
/sys/class/input/eventX/device/device/gain:
21
21
allows setting the sensitivity in the range from 0 to 31. Note that
+16
-14
drivers/input/mouse/elan_i2c_i2c.c
+16
-14
drivers/input/mouse/elan_i2c_i2c.c
···
554
554
struct completion *completion)
555
555
{
556
556
struct device *dev = &client->dev;
557
-
long ret;
558
557
int error;
559
558
int len;
560
-
u8 buffer[ETP_I2C_INF_LENGTH];
559
+
u8 buffer[ETP_I2C_REPORT_LEN];
560
+
561
+
len = i2c_master_recv(client, buffer, ETP_I2C_REPORT_LEN);
562
+
if (len != ETP_I2C_REPORT_LEN) {
563
+
error = len < 0 ? len : -EIO;
564
+
dev_warn(dev, "failed to read I2C data after FW WDT reset: %d (%d)\n",
565
+
error, len);
566
+
}
561
567
562
568
reinit_completion(completion);
563
569
enable_irq(client->irq);
564
570
565
571
error = elan_i2c_write_cmd(client, ETP_I2C_STAND_CMD, ETP_I2C_RESET);
566
-
if (!error)
567
-
ret = wait_for_completion_interruptible_timeout(completion,
568
-
msecs_to_jiffies(300));
569
-
disable_irq(client->irq);
570
-
571
572
if (error) {
572
573
dev_err(dev, "device reset failed: %d\n", error);
573
-
return error;
574
-
} else if (ret == 0) {
574
+
} else if (!wait_for_completion_timeout(completion,
575
+
msecs_to_jiffies(300))) {
575
576
dev_err(dev, "timeout waiting for device reset\n");
576
-
return -ETIMEDOUT;
577
-
} else if (ret < 0) {
578
-
error = ret;
579
-
dev_err(dev, "error waiting for device reset: %d\n", error);
580
-
return error;
577
+
error = -ETIMEDOUT;
581
578
}
579
+
580
+
disable_irq(client->irq);
581
+
582
+
if (error)
583
+
return error;
582
584
583
585
len = i2c_master_recv(client, buffer, ETP_I2C_INF_LENGTH);
584
586
if (len != ETP_I2C_INF_LENGTH) {
+1
drivers/input/touchscreen/atmel_mxt_ts.c
+1
drivers/input/touchscreen/atmel_mxt_ts.c
+1
-1
drivers/input/touchscreen/edt-ft5x06.c
+1
-1
drivers/input/touchscreen/edt-ft5x06.c
···
471
471
static EDT_ATTR(offset, S_IWUSR | S_IRUGO, WORK_REGISTER_OFFSET,
472
472
M09_REGISTER_OFFSET, 0, 31);
473
473
static EDT_ATTR(threshold, S_IWUSR | S_IRUGO, WORK_REGISTER_THRESHOLD,
474
-
M09_REGISTER_THRESHOLD, 20, 80);
474
+
M09_REGISTER_THRESHOLD, 0, 80);
475
475
static EDT_ATTR(report_rate, S_IWUSR | S_IRUGO, WORK_REGISTER_REPORT_RATE,
476
476
NO_REGISTER, 3, 14);
477
477