Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-06-14 12:29:41 +0200
committerTakashi Iwai <tiwai@suse.de>2012-06-14 12:29:41 +0200
commitfac0d9c9eba530fdb55a33b51b26b3b5b458a076 (patch)
tree3b1b6d37a6c4d86fbf0cd230b260623a4f27f55b
parent16fc2608937e5e779f84c9bcf36ab0bbf1096e55 (diff)
parent6e5a834a89b463ddc882b15c50aa65d88dfbbdeb (diff)
Merge branch 'synaptics-led' into openSUSE-12.2
-rw-r--r--patches.drivers/input-Add-LED-support-to-Synaptics-device15
1 files changed, 8 insertions, 7 deletions
diff --git a/patches.drivers/input-Add-LED-support-to-Synaptics-device b/patches.drivers/input-Add-LED-support-to-Synaptics-device
index d89e5976bb..1d93023353 100644
--- a/patches.drivers/input-Add-LED-support-to-Synaptics-device
+++ b/patches.drivers/input-Add-LED-support-to-Synaptics-device
@@ -20,9 +20,9 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
drivers/input/mouse/Kconfig | 8 ++
- drivers/input/mouse/synaptics.c | 123 ++++++++++++++++++++++++++++++++++++++++
+ drivers/input/mouse/synaptics.c | 124 ++++++++++++++++++++++++++++++++++++++++
drivers/input/mouse/synaptics.h | 3
- 3 files changed, 134 insertions(+)
+ 3 files changed, 135 insertions(+)
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -51,7 +51,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
#include <linux/slab.h>
#include "psmouse.h"
#include "synaptics.h"
-@@ -431,6 +432,122 @@ static void synaptics_pt_create(struct p
+@@ -431,6 +432,123 @@ static void synaptics_pt_create(struct p
serio_register_port(serio);
}
@@ -120,7 +120,8 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+ * So we check the product id to be sure.
+ */
+ if (SYN_CAP_PRODUCT_ID(priv->ext_cap) != 0xe4 &&
-+ SYN_CAP_PRODUCT_ID(priv->ext_cap) != 0x64)
++ SYN_CAP_PRODUCT_ID(priv->ext_cap) != 0x64 &&
++ SYN_CAP_PRODUCT_ID(priv->ext_cap) != 0x84)
+ return false;
+ if (!(priv->ext_cap_0c & 0x2000) &&
+ (priv->capabilities & 0xd00ff) != 0xd0073)
@@ -174,7 +175,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
/*****************************************************************************
* Functions to interpret the absolute mode packets
****************************************************************************/
-@@ -1276,6 +1393,7 @@ static void synaptics_disconnect(struct
+@@ -1276,6 +1394,7 @@ static void synaptics_disconnect(struct
device_remove_file(&psmouse->ps2dev.serio->dev,
&psmouse_attr_disable_gesture.dattr);
@@ -182,7 +183,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
synaptics_reset(psmouse);
kfree(priv);
psmouse->private = NULL;
-@@ -1332,6 +1450,8 @@ static int synaptics_reconnect(struct ps
+@@ -1332,6 +1451,8 @@ static int synaptics_reconnect(struct ps
return -1;
}
@@ -191,7 +192,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
return 0;
}
-@@ -1441,6 +1561,9 @@ static int __synaptics_init(struct psmou
+@@ -1441,6 +1562,9 @@ static int __synaptics_init(struct psmou
priv->model_id,
priv->capabilities, priv->ext_cap, priv->ext_cap_0c);