From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Aug 2015 07:38:42 +0000 (+0200)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v4.2-rc6~1
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=a230e95cc66a5a27e53459187ffcedb65b2782c3;hp=-c

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input subsystem fixes from Dmitry Torokhov:
 "Just small ALPS and Elan touchpads, and other driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elantech - add special check for fw_version 0x470f01 touchpad
  Input: twl4030-vibra - fix ERROR: Bad of_node_put() warning
  Input: alps - only Dell laptops have separate button bits for v2 dualpoint sticks
  Input: axp20x-pek - add module alias
  Input: turbografx - fix potential out of bound access
---

a230e95cc66a5a27e53459187ffcedb65b2782c3
diff --combined Documentation/input/alps.txt
index c86f2f1ae4f6,765d99cdadbb..1fec1135791d
--- a/Documentation/input/alps.txt
+++ b/Documentation/input/alps.txt
@@@ -58,7 -58,7 +58,7 @@@ To exit command mode, PSMOUSE_CMD_SETST
  While in command mode, register addresses can be set by first sending a
  specific command, either EC for v3 devices or F5 for v4 devices. Then the
  address is sent one nibble at a time, where each nibble is encoded as a
 -command with optional data. This enoding differs slightly between the v3 and
 +command with optional data. This encoding differs slightly between the v3 and
  v4 protocols.
  
  Once an address has been set, the addressed register can be read by sending
@@@ -119,8 -119,10 +119,10 @@@ ALPS Absolute Mode - Protocol Version 
   byte 5:  0   z6   z5   z4   z3   z2   z1   z0
  
  Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for
- the DualPoint Stick. For non interleaved dualpoint devices the pointingstick
- buttons get reported separately in the PSM, PSR and PSL bits.
+ the DualPoint Stick. The M, R and L bits signal the combined status of both
+ the pointingstick and touchpad buttons, except for Dell dualpoint devices
+ where the pointingstick buttons get reported separately in the PSM, PSR
+ and PSL bits.
  
  Dualpoint device -- interleaved packet format
  ---------------------------------------------
@@@ -144,7 -146,7 +146,7 @@@ ALPS Absolute Mode - Protocol Version 
  ---------------------------------------
  
  ALPS protocol version 3 has three different packet formats. The first two are
 -associated with touchpad events, and the third is associatd with trackstick
 +associated with touchpad events, and the third is associated with trackstick
  events.
  
  The first type is the touchpad position packet.