diff options
author | Ajay Ramaswamy <ajay@ramaswamy.net> | 2010-12-23 04:19:39 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-23 04:22:55 -0500 |
commit | 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 (patch) | |
tree | b21c6ed02bd0bdf18bdfb2138846ba80bd982a18 /drivers/input | |
parent | ab4e0192196b8d4e43a3945742d4996da934a86f (diff) |
Input: wacom - add support for digitizer in Lenovo W700
Signed-off-by: Ajay Ramaswamy <ajay@ramaswamy.net>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/tablet/wacom.h | 1 | ||||
-rw-r--r-- | drivers/input/tablet/wacom_wac.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h index de5adb109030..23317bd09c82 100644 --- a/drivers/input/tablet/wacom.h +++ b/drivers/input/tablet/wacom.h | |||
@@ -103,6 +103,7 @@ MODULE_DESCRIPTION(DRIVER_DESC); | |||
103 | MODULE_LICENSE(DRIVER_LICENSE); | 103 | MODULE_LICENSE(DRIVER_LICENSE); |
104 | 104 | ||
105 | #define USB_VENDOR_ID_WACOM 0x056a | 105 | #define USB_VENDOR_ID_WACOM 0x056a |
106 | #define USB_VENDOR_ID_LENOVO 0x17ef | ||
106 | 107 | ||
107 | struct wacom { | 108 | struct wacom { |
108 | dma_addr_t data_dma; | 109 | dma_addr_t data_dma; |
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 435b0af401e4..f72df2c4a649 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c | |||
@@ -1444,11 +1444,17 @@ static struct wacom_features wacom_features_0xDA = | |||
1444 | { "Wacom Bamboo 2FG 4x5 SE", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT }; | 1444 | { "Wacom Bamboo 2FG 4x5 SE", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT }; |
1445 | static struct wacom_features wacom_features_0xDB = | 1445 | static struct wacom_features wacom_features_0xDB = |
1446 | { "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN, 21648, 13530, 1023, 63, BAMBOO_PT }; | 1446 | { "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN, 21648, 13530, 1023, 63, BAMBOO_PT }; |
1447 | static const struct wacom_features wacom_features_0x6004 = | ||
1448 | { "ISD-V4", WACOM_PKGLEN_GRAPHIRE, 12800, 8000, 255, 0, TABLETPC }; | ||
1447 | 1449 | ||
1448 | #define USB_DEVICE_WACOM(prod) \ | 1450 | #define USB_DEVICE_WACOM(prod) \ |
1449 | USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \ | 1451 | USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \ |
1450 | .driver_info = (kernel_ulong_t)&wacom_features_##prod | 1452 | .driver_info = (kernel_ulong_t)&wacom_features_##prod |
1451 | 1453 | ||
1454 | #define USB_DEVICE_LENOVO(prod) \ | ||
1455 | USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ | ||
1456 | .driver_info = (kernel_ulong_t)&wacom_features_##prod | ||
1457 | |||
1452 | const struct usb_device_id wacom_ids[] = { | 1458 | const struct usb_device_id wacom_ids[] = { |
1453 | { USB_DEVICE_WACOM(0x00) }, | 1459 | { USB_DEVICE_WACOM(0x00) }, |
1454 | { USB_DEVICE_WACOM(0x10) }, | 1460 | { USB_DEVICE_WACOM(0x10) }, |
@@ -1525,6 +1531,7 @@ const struct usb_device_id wacom_ids[] = { | |||
1525 | { USB_DEVICE_WACOM(0xE2) }, | 1531 | { USB_DEVICE_WACOM(0xE2) }, |
1526 | { USB_DEVICE_WACOM(0xE3) }, | 1532 | { USB_DEVICE_WACOM(0xE3) }, |
1527 | { USB_DEVICE_WACOM(0x47) }, | 1533 | { USB_DEVICE_WACOM(0x47) }, |
1534 | { USB_DEVICE_LENOVO(0x6004) }, | ||
1528 | { } | 1535 | { } |
1529 | }; | 1536 | }; |
1530 | MODULE_DEVICE_TABLE(usb, wacom_ids); | 1537 | MODULE_DEVICE_TABLE(usb, wacom_ids); |