[kernel] r18570 - in dists/squeeze/linux-2.6/debian: . patches/features/all patches/series

[Uwe Kleine-König]

Author: ukleinek-guest
Date: Wed Jan 18 19:34:38 2012
New Revision: 18570

Log:
cherry pick commit from 2.6.35-rc6 fixing detection of HP 8560w's touchpad

Added:
   dists/squeeze/linux-2.6/debian/patches/features/all/Input-synaptics-relax-capability-ID-checks-on-newer-hardware.patch
   dists/squeeze/linux-2.6/debian/patches/series/42
Modified:
   dists/squeeze/linux-2.6/debian/changelog

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Wed Jan 18 16:14:04 2012	(r18569)
+++ dists/squeeze/linux-2.6/debian/changelog	Wed Jan 18 19:34:38 2012	(r18570)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.32-42) UNRELEASED; urgency=low
+
+  * cherry pick commit from 2.6.35-rc6 fixing detection of HP 8560w's touchpad
+    (Closes: #655481).
+
+ -- Uwe Kleine-König <u.kleine-koenig at pengutronix.de>  Mon, 16 Jan 2012 16:47:21 +0100
+
 linux-2.6 (2.6.32-41) stable; urgency=low
 
   [ Ben Hutchings ]

Added: dists/squeeze/linux-2.6/debian/patches/features/all/Input-synaptics-relax-capability-ID-checks-on-newer-hardware.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/Input-synaptics-relax-capability-ID-checks-on-newer-hardware.patch	Wed Jan 18 19:34:38 2012	(r18570)
@@ -0,0 +1,61 @@
+From: Dmitry Torokhov <dmitry.torokhov at gmail.com>
+Date: Wed, 21 Jul 2010 00:01:19 -0700
+Subject: [PATCH] Input: synaptics - relax capability ID checks on newer
+ hardware
+
+commit 3619b8fead04ab9de643712e757ef6b5f79fd1ab upstream.
+
+Older firmwares fixed the middle byte of the Synaptics capabilities
+query to 0x47, but starting with firmware 7.5 the middle byte
+represents submodel ID, sometimes also called "dash number".
+
+Reported-and-tested-by: Miroslav Šulc <fordfrog at gmail.com>
+Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
+---
+ drivers/input/mouse/synaptics.c |    7 ++++++-
+ drivers/input/mouse/synaptics.h |    3 ++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 9ba9c4a..705589d 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -141,8 +141,13 @@ static int synaptics_capability(struct psmouse *psmouse)
+ 	priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2];
+ 	priv->ext_cap = priv->ext_cap_0c = 0;
+ 
+-	if (!SYN_CAP_VALID(priv->capabilities))
++	/*
++	 * Older firmwares had submodel ID fixed to 0x47
++	 */
++	if (SYN_ID_FULL(priv->identity) < 0x705 &&
++	    SYN_CAP_SUBMODEL_ID(priv->capabilities) != 0x47) {
+ 		return -1;
++	}
+ 
+ 	/*
+ 	 * Unless capExtended is set the rest of the flags should be ignored
+diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
+index 7d4d5e1..b6aa7d2 100644
+--- a/drivers/input/mouse/synaptics.h
++++ b/drivers/input/mouse/synaptics.h
+@@ -47,7 +47,7 @@
+ #define SYN_CAP_FOUR_BUTTON(c)		((c) & (1 << 3))
+ #define SYN_CAP_MULTIFINGER(c)		((c) & (1 << 1))
+ #define SYN_CAP_PALMDETECT(c)		((c) & (1 << 0))
+-#define SYN_CAP_VALID(c)		((((c) & 0x00ff00) >> 8) == 0x47)
++#define SYN_CAP_SUBMODEL_ID(c)		(((c) & 0x00ff00) >> 8)
+ #define SYN_EXT_CAP_REQUESTS(c)		(((c) & 0x700000) >> 20)
+ #define SYN_CAP_MULTI_BUTTON_NO(ec)	(((ec) & 0x00f000) >> 12)
+ #define SYN_CAP_PRODUCT_ID(ec)		(((ec) & 0xff0000) >> 16)
+@@ -66,6 +66,7 @@
+ #define SYN_ID_MODEL(i)			(((i) >> 4) & 0x0f)
+ #define SYN_ID_MAJOR(i)			((i) & 0x0f)
+ #define SYN_ID_MINOR(i)			(((i) >> 16) & 0xff)
++#define SYN_ID_FULL(i)			((SYN_ID_MAJOR(i) << 8) | SYN_ID_MINOR(i))
+ #define SYN_ID_IS_SYNAPTICS(i)		((((i) >> 8) & 0xff) == 0x47)
+ 
+ /* synaptics special commands */
+-- 
+1.7.8.3
+

Added: dists/squeeze/linux-2.6/debian/patches/series/42
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/series/42	Wed Jan 18 19:34:38 2012	(r18570)
@@ -0,0 +1 @@
++ features/all/Input-synaptics-relax-capability-ID-checks-on-newer-hardware.patch