diff options
| author | Jussi Pakkanen <jussi.pakkanen@canonical.com> | 2012-01-10 23:04:16 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 12:59:16 -0800 |
| commit | 8cefc5594eeb8921d2230a8fdd2a940d9b5dba03 (patch) | |
| tree | c32922d29bef7d21f5d06b5f827839607569b4cb /drivers/input | |
| parent | 85f07ccc5309c780dbcdc4000556644d1bda4231 (diff) | |
| download | kernel_samsung_smdk4412-8cefc5594eeb8921d2230a8fdd2a940d9b5dba03.zip kernel_samsung_smdk4412-8cefc5594eeb8921d2230a8fdd2a940d9b5dba03.tar.gz kernel_samsung_smdk4412-8cefc5594eeb8921d2230a8fdd2a940d9b5dba03.tar.bz2 | |
Input: bcm5974 - set BUTTONPAD property
commit 52965cc012f7a3cf35f06485ec275ebf3b3fddae upstream.
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>
Cc: maximilian attems <max@stro.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/bcm5974.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 3126983..13e38ff 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -373,6 +373,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); } |