summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJussi Pakkanen <jussi.pakkanen@canonical.com>2012-01-10 23:04:16 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-01-10 23:14:13 -0800
commit52965cc012f7a3cf35f06485ec275ebf3b3fddae (patch)
tree3fc30bc5944f8696f9cc2e3b065c78b5f6278c84 /drivers/input
parent4fa0771138d0b56fe59ab8ab3b1ce9e594484362 (diff)
downloadlinux-52965cc012f7a3cf35f06485ec275ebf3b3fddae.tar.bz2
Input: bcm5974 - set BUTTONPAD property
Some bcm5974 trackpads have a physical button beneath the physical surface. This patch sets the property bit so user space applications can detect the trackpad type and act accordingly. Signed-off-by: Jussi Pakkanen <jussi.pakkanen@canonical.com> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/bcm5974.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 5ec617e28f7e..913e9fa4c810 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -433,6 +433,9 @@ static void setup_events_to_report(struct input_dev *input_dev,
__set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
__set_bit(BTN_LEFT, input_dev->keybit);
+ if (cfg->caps & HAS_INTEGRATED_BUTTON)
+ __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
+
input_set_events_per_packet(input_dev, 60);
}