1 files changed, 16 insertions, 279 deletions

diff --git a/Documentation/input/elantech.txt b/Documentation/input/elantech.txt
index 5602eb71ad5..db798af5ef9 100644
--- a/Documentation/input/elantech.txt
+++ b/Documentation/input/elantech.txt
@@ -16,28 +16,15 @@ Contents
 
  1. Introduction
  2. Extra knobs
- 3. Differentiating hardware versions
- 4. Hardware version 1
+ 3. Hardware version 1
+    3.1 Registers
+    3.2 Native relative mode 4 byte packet format
+    3.3 Native absolute mode 4 byte packet format
+ 4. Hardware version 2
     4.1 Registers
-    4.2 Native relative mode 4 byte packet format
-    4.3 Native absolute mode 4 byte packet format
- 5. Hardware version 2
-    5.1 Registers
-    5.2 Native absolute mode 6 byte packet format
-        5.2.1 Parity checking and packet re-synchronization
-        5.2.2 One/Three finger touch
-        5.2.3 Two finger touch
- 6. Hardware version 3
-    6.1 Registers
-    6.2 Native absolute mode 6 byte packet format
-        6.2.1 One/Three finger touch
-        6.2.2 Two finger touch
- 7. Hardware version 4
-    7.1 Registers
-    7.2 Native absolute mode 6 byte packet format
-        7.2.1 Status packet
-        7.2.2 Head packet
-        7.2.3 Motion packet
+    4.2 Native absolute mode 6 byte packet format
+        4.2.1 One finger touch
+        4.2.2 Two finger touch
 
 
 
@@ -388,7 +375,7 @@ For all the other ones, there are just a few constant bits:
 
 In case an error is detected, all the packets are shifted by one (and packet[0] is discarded).
 
-5.2.2 One/Three finger touch
+5.2.1 One/Three finger touch
       ~~~~~~~~~~~~~~~~
 
 byte 0:
@@ -397,19 +384,19 @@ byte 0:
          n1  n0  w3  w2   .   .   R   L
 
          L, R = 1 when Left, Right mouse button pressed
-         n1..n0 = number of fingers on touchpad
+         n1..n0 = numbers of fingers on touchpad
 
 byte 1:
 
    bit   7   6   5   4   3   2   1   0
-         p7  p6  p5  p4 x11 x10 x9  x8
+         p7  p6  p5  p4  .  x10 x9  x8
 
 byte 2:
 
    bit   7   6   5   4   3   2   1   0
          x7  x6  x5  x4  x3  x2  x1  x0
 
-         x11..x0 = absolute x value (horizontal)
+         x10..x0 = absolute x value (horizontal)
 
 byte 3:
 
@@ -433,7 +420,7 @@ byte 3:
 byte 4:
 
    bit   7   6   5   4   3   2   1   0
-        p3  p1  p2  p0  y11 y10 y9  y8
+        p3  p1  p2  p0   .   .  y9  y8
 
          p7..p0 = pressure (not EF113)
 
@@ -442,10 +429,10 @@ byte 5:
    bit   7   6   5   4   3   2   1   0
         y7  y6  y5  y4  y3  y2  y1  y0
 
-         y11..y0 = absolute y value (vertical)
+         y9..y0 = absolute y value (vertical)
 
 
-5.2.3 Two finger touch
+4.2.2 Two finger touch
       ~~~~~~~~~~~~~~~~
 
 Note that the two pairs of coordinates are not exactly the coordinates of the
@@ -459,7 +446,7 @@ byte 0:
         n1  n0  ay8 ax8  .   .   R   L
 
          L, R = 1 when Left, Right mouse button pressed
-         n1..n0 = number of fingers on touchpad
+         n1..n0 = numbers of fingers on touchpad
 
 byte 1:
 
@@ -493,253 +480,3 @@ byte 5:
         by7 by8 by5 by4 by3 by2 by1 by0
 
          by8..by0 = upper-right finger absolute y value
-
-/////////////////////////////////////////////////////////////////////////////
-
-6. Hardware version 3
-   ==================
-
-6.1 Registers
-    ~~~~~~~~~
-* reg_10
-
-   bit   7   6   5   4   3   2   1   0
-         0   0   0   0   0   0   0   A
-
-         A: 1 = enable absolute tracking
-
-6.2 Native absolute mode 6 byte packet format
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1 and 3 finger touch shares the same 6-byte packet format, except that
-3 finger touch only reports the position of the center of all three fingers.
-
-Firmware would send 12 bytes of data for 2 finger touch.
-
-Note on debounce:
-In case the box has unstable power supply or other electricity issues, or
-when number of finger changes, F/W would send "debounce packet" to inform
-driver that the hardware is in debounce status.
-The debouce packet has the following signature:
-    byte 0: 0xc4
-    byte 1: 0xff
-    byte 2: 0xff
-    byte 3: 0x02
-    byte 4: 0xff
-    byte 5: 0xff
-When we encounter this kind of packet, we just ignore it.
-
-6.2.1 One/Three finger touch
-      ~~~~~~~~~~~~~~~~~~~~~~
-
-byte 0:
-
-   bit   7   6   5   4   3   2   1   0
-        n1  n0  w3  w2   0   1   R   L
-
-        L, R = 1 when Left, Right mouse button pressed
-        n1..n0 = number of fingers on touchpad
-
-byte 1:
-
-   bit   7   6   5   4   3   2   1   0
-        p7  p6  p5  p4 x11 x10  x9  x8
-
-byte 2:
-
-   bit   7   6   5   4   3   2   1   0
-        x7  x6  x5  x4  x3  x2  x1  x0
-
-        x11..x0 = absolute x value (horizontal)
-
-byte 3:
-
-   bit   7   6   5   4   3   2   1   0
-         0   0  w1  w0   0   0   1   0
-
-         w3..w0 = width of the finger touch
-
-byte 4:
-
-   bit   7   6   5   4   3   2   1   0
-        p3  p1  p2  p0  y11 y10 y9  y8
-
-        p7..p0 = pressure
-
-byte 5:
-
-   bit   7   6   5   4   3   2   1   0
-        y7  y6  y5  y4  y3  y2  y1  y0
-
-        y11..y0 = absolute y value (vertical)
-
-6.2.2 Two finger touch
-      ~~~~~~~~~~~~~~~~
-
-The packet format is exactly the same for two finger touch, except the hardware
-sends two 6 byte packets. The first packet contains data for the first finger,
-the second packet has data for the second finger. So for two finger touch a
-total of 12 bytes are sent.
-
-/////////////////////////////////////////////////////////////////////////////
-
-7. Hardware version 4
-   ==================
-
-7.1 Registers
-    ~~~~~~~~~
-* reg_07
-
-   bit   7   6   5   4   3   2   1   0
-         0   0   0   0   0   0   0   A
-
-         A: 1 = enable absolute tracking
-
-7.2 Native absolute mode 6 byte packet format
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-v4 hardware is a true multitouch touchpad, capable of tracking up to 5 fingers.
-Unfortunately, due to PS/2's limited bandwidth, its packet format is rather
-complex.
-
-Whenever the numbers or identities of the fingers changes, the hardware sends a
-status packet to indicate how many and which fingers is on touchpad, followed by
-head packets or motion packets. A head packet contains data of finger id, finger
-position (absolute x, y values), width, and pressure. A motion packet contains
-two fingers' position delta.
-
-For example, when status packet tells there are 2 fingers on touchpad, then we
-can expect two following head packets. If the finger status doesn't change,
-the following packets would be motion packets, only sending delta of finger
-position, until we receive a status packet.
-
-One exception is one finger touch. when a status packet tells us there is only
-one finger, the hardware would just send head packets afterwards.
-
-7.2.1 Status packet
-      ~~~~~~~~~~~~~
-
-byte 0:
-
-   bit   7   6   5   4   3   2   1   0
-         .   .   .   .   0   1   R   L
-
-         L, R = 1 when Left, Right mouse button pressed
-
-byte 1:
-
-   bit   7   6   5   4   3   2   1   0
-         .   .   . ft4 ft3 ft2 ft1 ft0
-
-         ft4 ft3 ft2 ft1 ft0 ftn = 1 when finger n is on touchpad
-
-byte 2: not used
-
-byte 3:
-
-   bit   7   6   5   4   3   2   1   0
-         .   .   .   1   0   0   0   0
-
-         constant bits
-
-byte 4:
-
-   bit   7   6   5   4   3   2   1   0
-         p   .   .   .   .   .   .   .
-
-         p = 1 for palm
-
-byte 5: not used
-
-7.2.2 Head packet
-      ~~~~~~~~~~~
-
-byte 0:
-
-   bit   7   6   5   4   3   2   1   0
-        w3  w2  w1  w0   0   1   R   L
-
-        L, R = 1 when Left, Right mouse button pressed
-        w3..w0 = finger width (spans how many trace lines)
-
-byte 1:
-
-   bit   7   6   5   4   3   2   1   0
-        p7  p6  p5  p4 x11 x10  x9  x8
-
-byte 2:
-
-   bit   7   6   5   4   3   2   1   0
-        x7  x6  x5  x4  x3  x2  x1  x0
-
-        x11..x0 = absolute x value (horizontal)
-
-byte 3:
-
-   bit   7   6   5   4   3   2   1   0
-       id2 id1 id0   1   0   0   0   1
-
-       id2..id0 = finger id
-
-byte 4:
-
-   bit   7   6   5   4   3   2   1   0
-        p3  p1  p2  p0  y11 y10 y9  y8
-
-        p7..p0 = pressure
-
-byte 5:
-
-   bit   7   6   5   4   3   2   1   0
-        y7  y6  y5  y4  y3  y2  y1  y0
-
-        y11..y0 = absolute y value (vertical)
-
-7.2.3 Motion packet
-      ~~~~~~~~~~~~~
-
-byte 0:
-
-   bit   7   6   5   4   3   2   1   0
-       id2 id1 id0   w   0   1   R   L
-
-       L, R = 1 when Left, Right mouse button pressed
-       id2..id0 = finger id
-       w = 1 when delta overflows (> 127 or < -128), in this case
-       firmware sends us (delta x / 5) and (delta y  / 5)
-
-byte 1:
-
-   bit   7   6   5   4   3   2   1   0
-        x7  x6  x5  x4  x3  x2  x1  x0
-
-        x7..x0 = delta x (two's complement)
-
-byte 2:
-
-   bit   7   6   5   4   3   2   1   0
-        y7  y6  y5  y4  y3  y2  y1  y0
-
-        y7..y0 = delta y (two's complement)
-
-byte 3:
-
-   bit   7   6   5   4   3   2   1   0
-       id2 id1 id0   1   0   0   1   0
-
-       id2..id0 = finger id
-
-byte 4:
-
-   bit   7   6   5   4   3   2   1   0
-        x7  x6  x5  x4  x3  x2  x1  x0
-
-        x7..x0 = delta x (two's complement)
-
-byte 5:
-
-   bit   7   6   5   4   3   2   1   0
-        y7  y6  y5  y4  y3  y2  y1  y0
-
-        y7..y0 = delta y (two's complement)
-
-        byte 0 ~ 2 for one finger
-        byte 3 ~ 5 for another