HID: multitouch: Add advanced silicon cooltouch controllers

BUG=None
TEST=Boot kernel on machine with cooltouch controller attached.
Verify hid_multitouch module is loaded for the USB device.

Change-Id: I89c6e29ae7696ed23ca44fb45076d888584e1a05
Signed-off-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/39576
Reviewed-by: Olof Johansson <olofj@chromium.org>

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index aa7a68833f41ba37328bea98fa0515ba39cb8892..b87d578176fd67c4122fcc3368ce602e9bb1192f 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -44,6 +44,10 @@
 #define USB_VENDOR_ID_ADS_TECH         0x06e1
 #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X    0xa155
 
+#define USB_VENDOR_ID_ADVANCED_SILICON 0x2149
+#define USB_DEVICE_ID_ADVANCED_SILICON_2306    0x2306
+#define USB_DEVICE_ID_ADVANCED_SILICON_2308    0x2308
+
 #define USB_VENDOR_ID_AFATECH          0x15a4
 #define USB_DEVICE_ID_AFATECH_AF9016   0x9016
 

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 454e1ed6e2bb3713d996494e81ea4833862dcdb7..492c0ebabef5bf2b35961862a29e928d5565f34c 100644 (file)
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -741,6 +741,14 @@ static const struct hid_device_id mt_devices[] = {
                HID_USB_DEVICE(USB_VENDOR_ID_ACTIONSTAR,
                        USB_DEVICE_ID_ACTIONSTAR_1011) },
 
+       /* Advanced Silicon panels */
+       { .driver_data = MT_CLS_DEFAULT,
+               HID_USB_DEVICE(USB_VENDOR_ID_ADVANCED_SILICON,
+                       USB_DEVICE_ID_ADVANCED_SILICON_2306) },
+       { .driver_data = MT_CLS_DEFAULT,
+               HID_USB_DEVICE(USB_VENDOR_ID_ADVANCED_SILICON,
+                       USB_DEVICE_ID_ADVANCED_SILICON_2308) },
+
        /* Atmel panels */
        { .driver_data = MT_CLS_SERIAL,
                HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,