aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/mouse/bcm5974.c4
-rw-r--r--include/linux/input.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index bda873393b0d..2ddf05e1d852 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -258,6 +258,7 @@ static void setup_events_to_report(struct input_dev *input_dev,
258 __set_bit(BTN_TOOL_FINGER, input_dev->keybit); 258 __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
259 __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit); 259 __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
260 __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); 260 __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
261 __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
261 __set_bit(BTN_LEFT, input_dev->keybit); 262 __set_bit(BTN_LEFT, input_dev->keybit);
262} 263}
263 264
@@ -329,7 +330,8 @@ static int report_tp_state(struct bcm5974 *dev, int size)
329 input_report_key(input, BTN_TOUCH, dev->fingers > 0); 330 input_report_key(input, BTN_TOUCH, dev->fingers > 0);
330 input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1); 331 input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1);
331 input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2); 332 input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2);
332 input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers > 2); 333 input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers == 3);
334 input_report_key(input, BTN_TOOL_QUADTAP, dev->fingers > 3);
333 335
334 input_report_abs(input, ABS_PRESSURE, abs_p); 336 input_report_abs(input, ABS_PRESSURE, abs_p);
335 input_report_abs(input, ABS_TOOL_WIDTH, abs_w); 337 input_report_abs(input, ABS_TOOL_WIDTH, abs_w);
diff --git a/include/linux/input.h b/include/linux/input.h
index 6b28048fc568..32cb825939be 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -445,6 +445,7 @@ struct input_absinfo {
445#define BTN_STYLUS2 0x14c 445#define BTN_STYLUS2 0x14c
446#define BTN_TOOL_DOUBLETAP 0x14d 446#define BTN_TOOL_DOUBLETAP 0x14d
447#define BTN_TOOL_TRIPLETAP 0x14e 447#define BTN_TOOL_TRIPLETAP 0x14e
448#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */
448 449
449#define BTN_WHEEL 0x150 450#define BTN_WHEEL 0x150
450#define BTN_GEAR_DOWN 0x150 451#define BTN_GEAR_DOWN 0x150