summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2010-12-16 09:52:23 +0100
committerHenrik Rydberg <rydberg@euromail.se>2010-12-21 18:09:19 +0100
commitc14890a8e54977f895773d393d6a640d6d698fb8 (patch)
treef865c12eba520ec6db8f6cf0b640f867dbd3ffc5 /drivers/input
parent22f075a8d8bb5a8d203392df809739c1817e578f (diff)
downloadlinux-3.10-c14890a8e54977f895773d393d6a640d6d698fb8.tar.gz
linux-3.10-c14890a8e54977f895773d393d6a640d6d698fb8.tar.bz2
linux-3.10-c14890a8e54977f895773d393d6a640d6d698fb8.zip
Input: synaptics - report clickpad property
With the new input property interface, it is possible to report the special quirks of a device using ioctl/sysfs. This patch sets up the device as a pointer, and reports the clickpad functionality via the INPUT_PROP_BUTTONPAD property. Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/synaptics.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 2e300a46055..8997cbc69dc 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -622,6 +622,8 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
{
int i;
+ __set_bit(INPUT_PROP_POINTER, dev->propbit);
+
__set_bit(EV_ABS, dev->evbit);
input_set_abs_params(dev, ABS_X,
XMIN_NOMINAL, priv->x_max ?: XMAX_NOMINAL, 0, 0);
@@ -663,6 +665,7 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
input_abs_set_res(dev, ABS_Y, priv->y_res);
if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
+ __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
/* Clickpads report only left button */
__clear_bit(BTN_RIGHT, dev->keybit);
__clear_bit(BTN_MIDDLE, dev->keybit);