diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-27 01:45:13 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-27 01:45:13 +0200 |
commit | c86daad2c25bfd4a33d48b7691afaa96d9c5ab46 (patch) | |
tree | 5bd19f795dc87897173918d41ed2ffc9ac028774 /Documentation/input | |
parent | Merge tag 'led_fixes_for_4-12-rc3' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | Input: elan_i2c - ignore signals when finishing updating firmware (diff) | |
download | linux-c86daad2c25bfd4a33d48b7691afaa96d9c5ab46.tar.xz linux-c86daad2c25bfd4a33d48b7691afaa96d9c5ab46.zip |
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
Diffstat (limited to 'Documentation/input')
-rw-r--r-- | Documentation/input/devices/edt-ft5x06.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/input/devices/edt-ft5x06.rst b/Documentation/input/devices/edt-ft5x06.rst index 2032f0b7a8fa..1ccc94b192b7 100644 --- a/Documentation/input/devices/edt-ft5x06.rst +++ b/Documentation/input/devices/edt-ft5x06.rst @@ -15,7 +15,7 @@ It has been tested with the following devices: The driver allows configuration of the touch screen via a set of sysfs files: /sys/class/input/eventX/device/device/threshold: - allows setting the "click"-threshold in the range from 20 to 80. + allows setting the "click"-threshold in the range from 0 to 80. /sys/class/input/eventX/device/device/gain: allows setting the sensitivity in the range from 0 to 31. Note that |