Change the dev2's name from "PS/2 Mouse" to "ALPS PS/2 Device".
Signed-off-by: NYunkang Tang <yunkang.tang@cn.alps.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

This form is more concise.
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

These touchpads use a different protocol; they have been seen on Dell
N5110, Dell 17R SE, and others.

The official ALPS driver identifies them by looking for an exact match
on the E7 report: 73 03 50.  Dolphin V1 returns an EC report of
73 01 xx (02 and 0d have been seen); Dolphin V2 returns an EC report of
73 02 xx (02 has been seen).

Dolphin V2 probably needs a different initialization sequence and/or
report parser, so it is left for a future commit.
Signed-off-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

Now that alps_identify() explicitly issues an EC report using
alps_rpt_cmd(), we no longer need to look at the magic numbers returned
by alps_enter_command_mode().
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

Separate out the common trackstick probe/setup sequences, then call them
from each of the v3 init functions.

Credits: Emmanual Thome furnished the information on the trackstick init
and how it affected the report format.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

Rushmore touchpads are found on Dell E6230/E6430/E6530.  They use the V3
protocol with slightly tweaked init sequences and report formats.

The E7 report is 73 03 0a, and the EC report is 88 08 1d

Credits: Emmanuel Thome reported the MT bitmap changes.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

A number of different ALPS touchpad protocols can reuse
alps_process_touchpad_packet_v3() with small tweaks to the bitfield
decoding.  Create a new priv->decode_fields() callback that handles the
per-model differences.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

Newer touchpads use different constants, so make them runtime-
configurable.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

Pinnacle class devices should return "88 07 xx" or "88 08 xx" when
entering command mode.  If either the first byte or the second byte is
invalid, return an error.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

The official ALPS driver uses the EC report, not the E7 report, to detect
these devices.  Also, they check for a range of values; the original
table-based code only checked for two specific ones.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

This allows alps_identify() to override these settings based on the
device characteristics, if it is ever necessary.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

In anticipation of adding more ALPS protocols and more per-device quirks,
use function pointers instead of switch statements to call functions that
differ from one device to the next.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

If the E6 report test passes, get the E7 and EC reports right away and
then try to match an entry in the table.

Pass in the alps_data struct, so that the detection code will be able to
set operating parameters based on information found during detection.

Change the version (psmouse->model) to report the protocol version only,
in preparation for supporting models that do not show up in the ID table.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

Several ALPS driver init sequences repeat a command three times, then
issue PSMOUSE_CMD_GETINFO to read the result.  Move this into a helper
function to simplify the code.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

This will minimize the number of forward declarations needed when
alps_get_model() starts assigning function pointers.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

Not every type of ALPS touchpad is well-suited to table-based detection.
Start moving the various alps_model_data attributes into the alps_data
struct so that we don't need a unique table entry for every possible
permutation of protocol version, flags, byte0/mask0, etc.
Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
Tested-by: NDave Turvene <dturvene@dahetral.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

Signed-off-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

Preparing to move more repeated code into the mt core, add a flags
argument to the input_mt_slots_init() function.
Reviewed-and-tested-by: NBenjamin Tissoires <benjamin.tissoires@enac.fr>
Tested-by: NPing Cheng <pingc@wacom.com>
Acked-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: NHenrik Rydberg <rydberg@euromail.se>

Instead of open-coded reporting number of fingers on the touchpad
let's use input_mt_report_finger_count() helper.
Acked-by: NSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

This patch adds semi-MT support for ALPS v4 protocol touchpads.
It is based on the work by Seth Forshee for ALPS v3 and v4 protocol
support. Three packets are required to assemble and process the MT
data. ST events are reported at once to avoid latency. If there
were two contacts or more, report MT data instead of ST events.

Thanks to Seth Forshee for providing most of the code, guidance
and insight for producing this patch.
Signed-off-by: NGeorge Pantalos <gpantalos@gmail.com>
Acked-by: NSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

ALPS touchpad detection fails if some buttons of ALPS are pressed.
The reason is that the "E6" query response byte is different from
what is expected.

This was tested on a Toshiba Portege R500.

Cc: stable <stable@vger.kernel.org>
Signed-off-by: NAkio Idehara <zbe64533@gmail.com>
Tested-by: NSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Signed-off-by: NSeth Forshee <seth.forshee@canonical.com>
Acked-by: NChase Douglas <chase.douglas@canonical.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

This patch adds support for two ALPS touchpad protocols not
supported currently by the driver, which I am arbitrarily naming
version 3 and version 4. Support is single-touch only at this time,
although both protocols are capable of limited multitouch support.

Thanks to Andrew Skalski, who did the initial reverse-engineering
of the v3 protocol.
Signed-off-by: NSeth Forshee <seth.forshee@canonical.com>
Acked-by: NChase Douglas <chase.douglas@canonical.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

In preparation for version 4 protocol support, which has 8-byte
data packets, remove all hard-coded assumptions about packet size
and use psmouse->pktsize instead.
Signed-off-by: NSeth Forshee <seth.forshee@canonical.com>
Acked-by: NChase Douglas <chase.douglas@canonical.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

In preparation for adding support for more ALPS protocol versions,
add a field for the protocol version to the model info instead of
using a field in the flags. OLDPROTO and !OLDPROTO are now called
version 1 and version 2, repsectively.
Signed-off-by: NSeth Forshee <seth.forshee@canonical.com>
Acked-by: NChase Douglas <chase.douglas@canonical.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

In preparation for new protocol support, move the protocol
information currently documented in alps.c to
Documentation/input/alps.txt, where it can be expanded without
cluttering up the driver.
Signed-off-by: NSeth Forshee <seth.forshee@canonical.com>
Acked-by: NChase Douglas <chase.douglas@canonical.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

This will ensure our reporting is consistent with the rest of the system
and we do not refer to obsolete source file names.
Reviewed-by: NWanlong Gao <gaowanlong@cn.fujitsu.com>
Reviewed-by: NJJ Ding <dgdunix@gmail.com>
Reviewed-by: NDaniel Kurtz <djkurtz@chromium.org>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

This reverts commit 5e28d8eb since
the magic knock does not work for this model of the touchpad and the
device stays in PS/2 compatibility mode.

Tested by a user running Ubuntu 9.10 in the following bug report.

BugLink: http://bugs.launchpad.net/bugs/545307Signed-off-by: NChase Douglas <chase.douglas@canonical.com>
Cc: stable@kernel.org
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files.  percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.

percpu.h -> slab.h dependency is about to be removed.  Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability.  As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.

  http://userweb.kernel.org/~tj/misc/slabh-sweep.py

The script does the followings.

* Scan files for gfp and slab usages and update includes such that
  only the necessary includes are there.  ie. if only gfp is used,
  gfp.h, if slab is used, slab.h.

* When the script inserts a new include, it looks at the include
  blocks and try to put the new include such that its order conforms
  to its surrounding.  It's put in the include block which contains
  core kernel includes, in the same order that the rest are ordered -
  alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
  doesn't seem to be any matching order.

* If the script can't find a place to put a new include (mostly
  because the file doesn't have fitting include block), it prints out
  an error message indicating which .h file needs to be added to the
  file.

The conversion was done in the following steps.

1. The initial automatic conversion of all .c files updated slightly
   over 4000 files, deleting around 700 includes and adding ~480 gfp.h
   and ~3000 slab.h inclusions.  The script emitted errors for ~400
   files.

2. Each error was manually checked.  Some didn't need the inclusion,
   some needed manual addition while adding it to implementation .h or
   embedding .c file was more appropriate for others.  This step added
   inclusions to around 150 files.

3. The script was run again and the output was compared to the edits
   from #2 to make sure no file was left behind.

4. Several build tests were done and a couple of problems were fixed.
   e.g. lib/decompress_*.c used malloc/free() wrappers around slab
   APIs requiring slab.h to be added manually.

5. The script was run on all .h files but without automatically
   editing them as sprinkling gfp.h and slab.h inclusions around .h
   files could easily lead to inclusion dependency hell.  Most gfp.h
   inclusion directives were ignored as stuff from gfp.h was usually
   wildly available and often used in preprocessor macros.  Each
   slab.h inclusion directive was examined and added manually as
   necessary.

6. percpu.h was updated not to include slab.h.

7. Build test were done on the following configurations and failures
   were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
   distributed build env didn't work with gcov compiles) and a few
   more options had to be turned off depending on archs to make things
   build (like ipr on powerpc/64 which failed due to missing writeq).

   * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
   * powerpc and powerpc64 SMP allmodconfig
   * sparc and sparc64 SMP allmodconfig
   * ia64 SMP allmodconfig
   * s390 SMP allmodconfig
   * alpha SMP allmodconfig
   * um on x86_64 SMP allmodconfig

8. percpu.h modifications were reverted so that it could be applied as
   a separate patch and serve as bisection point.

Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: NTejun Heo <tj@kernel.org>
Guess-its-ok-by: NChristoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

Enable button release event redirection to the device that got the
button press not only for touchpads with interleaved protocols, but
unconditionally for all Alps touchpads. This is required at least
for the touchpads in Dell Inspiron 8200 and Latitude d630.
Signed-off-by: NMartin Buck <mb-tmp-yvahk-vachg@gromit.dyndns.org>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Signed-off-by: NThomas Bächler <thomas@archlinux.org>
Cc: stable@kernel.org
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Properly handle version of the protocol where standard PS/2 packets
from trackpoint are stuffed into middle (byte 3-6) of the standard
ALPS packets when both the touchpad and trackpoint are used together.

The patch is based on work done by Matthew Chapman and additional
research done by David Kubicek and Erik Osterholm:

	https://bugs.launchpad.net/ubuntu/+source/linux/+bug/296610

Many thanks to David Kubicek for his efforts in researching fine points
of this new version of the protocol, especially interaction between pad
and stick in these models.
Signed-off-by: NSebastian Kapfer <sebastian_kapfer@gmx.net>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Relative events are only reported via secondary device therefore device
associated with the touchpad should not advertise these capabilities.
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

The touchpad on Acer Aspire 5720, 5520 and some other Aspire models
(signature 0x73, 0x02, 0x50) has a button that can be rocked in 4
different directions. Make the driver to generate BTN_0..BTN_3 events
in response. The Synaptics driver by default maps BTN_0 and BTN_1 to
up and down, so there should be no visible changes with the old setup
that generated BTN_FORWARD and BTN_BACK (also mapped to up and down).
Signed-off-by: NMaxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

When pressing any button belonging to the touchpoint, the generated
click events don't belong to the touchpoint but to the touchpad.
This patch fixes this behaviour, the events will be sent via the
correct device, so scrolling with touchpoint is possible.
Signed-off-by: NUlrich Dangel <uli@spamt.net>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Dell Latitude D630/D800 have DualPoint (touchpad plus trackpoint)
instead of a simple touchpad and a pass-through port for external
PS/2 mouse.
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>

This toshiba has a touchpad with trackpoint and 2 sets of left
and right buttons (above and below touchpad).
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>

Signed-off-by: NElvis Pranskevichus <el@prans.net>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>