diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-07 11:31:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-07 11:31:31 -0500 |
| commit | d09b3c9618f72ca018836998b13045edec3c8301 (patch) | |
| tree | 4bdd35249faad438fee4b3cdf6fb9c78fc635823 /Documentation | |
| parent | 4293f20c19f44ca66e5ac836b411d25e14b9f185 (diff) | |
| parent | 19d57d3a145e94349abf805eed2316ef720d86c2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: "Just a few driver fixups,
nothing exciting."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - fix 3rd-gen Bamboo MT when 4+ fingers are in use
Input: twl4030-vibra - use proper guard for PM methods
Input: evdev - fix variable initialisation
Input: wacom - add missing LEDS_CLASS to Kconfig
Input: ALPS - fix touchpad detection when buttons are pressed
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/input/alps.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt index f274c28b5103..2f95308251d4 100644 --- a/Documentation/input/alps.txt +++ b/Documentation/input/alps.txt | |||
| @@ -13,7 +13,8 @@ Detection | |||
| 13 | 13 | ||
| 14 | All ALPS touchpads should respond to the "E6 report" command sequence: | 14 | All ALPS touchpads should respond to the "E6 report" command sequence: |
| 15 | E8-E6-E6-E6-E9. An ALPS touchpad should respond with either 00-00-0A or | 15 | E8-E6-E6-E6-E9. An ALPS touchpad should respond with either 00-00-0A or |
| 16 | 00-00-64. | 16 | 00-00-64 if no buttons are pressed. The bits 0-2 of the first byte will be 1s |
| 17 | if some buttons are pressed. | ||
| 17 | 18 | ||
| 18 | If the E6 report is successful, the touchpad model is identified using the "E7 | 19 | If the E6 report is successful, the touchpad model is identified using the "E7 |
| 19 | report" sequence: E8-E7-E7-E7-E9. The response is the model signature and is | 20 | report" sequence: E8-E7-E7-E7-E9. The response is the model signature and is |