[PATCH 2/3] HID: rmi: Support touchpads with external buttons

[Andrew Duggan <aduggan@synaptics.com>]

The external buttons on HID touchpads are connected as pass through devices and
button events are not reported in the rmi registers. As a result on these
devices we need to allow the HID generic desktop button events to be processed
by hid-input.

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
---
 drivers/hid/hid-rmi.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 018f80f..cdfe165 100644
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -35,6 +35,7 @@
 
 /* device flags */
 #define RMI_DEVICE			BIT(0)
+#define RMI_DEVICE_HAS_PHYS_BUTTONS	BIT(1)
 
 enum rmi_mode_type {
 	RMI_MODE_OFF			= 0,
@@ -472,6 +473,9 @@ static int rmi_event(struct hid_device *hdev, struct hid_field *field,
 	if ((data->device_flags & RMI_DEVICE) &&
 	    (field->application == HID_GD_POINTER ||
 	    field->application == HID_GD_MOUSE)) {
+		if ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON)
+			return 0;
+
 		rmi_schedule_reset(hdev);
 		return 1;
 	}
@@ -942,6 +946,10 @@ static int rmi_input_mapping(struct hid_device *hdev,
 	 * we want to make HID ignore the advertised HID collection
 	 * for RMI deivces
 	 */
+	if ((data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS) &&
+	    ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON))
+		return 0;
+
 	if (data->device_flags & RMI_DEVICE)
 		return -1;
 
-- 
2.1.0