diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-20 06:15:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-20 06:15:44 -0400 |
| commit | 9ed326951806c424b42dcf2e1125e25a98fb13d1 (patch) | |
| tree | 587324cd7fba8d085b151d5c285121039c867dd9 | |
| parent | d464c92b5234227c1698862a1906827e2e398ae0 (diff) | |
HID: multitouch: Add support for Baanto touchscreen
Reported-by: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk>
Tested-by: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 990fe19330e6..7e7db307664f 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -1388,6 +1388,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 1388 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) }, | 1388 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) }, |
| 1389 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) }, | 1389 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) }, |
| 1390 | { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, | 1390 | { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, |
| 1391 | { HID_USB_DEVICE(USB_VENDOR_ID_BAANTO, USB_DEVICE_ID_BAANTO_MT_190W2), }, | ||
| 1391 | { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) }, | 1392 | { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) }, |
| 1392 | { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) }, | 1393 | { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) }, |
| 1393 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) }, | 1394 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 3eb00902ca40..dbcbf30d68d9 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -157,6 +157,9 @@ | |||
| 157 | #define USB_VENDOR_ID_AVERMEDIA 0x07ca | 157 | #define USB_VENDOR_ID_AVERMEDIA 0x07ca |
| 158 | #define USB_DEVICE_ID_AVER_FM_MR800 0xb800 | 158 | #define USB_DEVICE_ID_AVER_FM_MR800 0xb800 |
| 159 | 159 | ||
| 160 | #define USB_VENDOR_ID_BAANTO 0x2453 | ||
| 161 | #define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100 | ||
| 162 | |||
| 160 | #define USB_VENDOR_ID_BELKIN 0x050d | 163 | #define USB_VENDOR_ID_BELKIN 0x050d |
| 161 | #define USB_DEVICE_ID_FLIP_KVM 0x3201 | 164 | #define USB_DEVICE_ID_FLIP_KVM 0x3201 |
| 162 | 165 | ||
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 1d5b94167b52..b929883e8a5b 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
| @@ -749,6 +749,10 @@ static const struct hid_device_id mt_devices[] = { | |||
| 749 | HID_USB_DEVICE(USB_VENDOR_ID_ATMEL, | 749 | HID_USB_DEVICE(USB_VENDOR_ID_ATMEL, |
| 750 | USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) }, | 750 | USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) }, |
| 751 | 751 | ||
| 752 | /* Baanto multitouch devices */ | ||
| 753 | { .driver_data = MT_CLS_DEFAULT, | ||
| 754 | HID_USB_DEVICE(USB_VENDOR_ID_BAANTO, | ||
| 755 | USB_DEVICE_ID_BAANTO_MT_190W2) }, | ||
| 752 | /* Cando panels */ | 756 | /* Cando panels */ |
| 753 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, | 757 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, |
| 754 | HID_USB_DEVICE(USB_VENDOR_ID_CANDO, | 758 | HID_USB_DEVICE(USB_VENDOR_ID_CANDO, |
