Add support for the built-in digitizer in the Lenovo W700
Subsystems (2)
PATCH 1/1 Add support for the built-in digitizer in the Lenovo W700
From: Ajay Ramaswamy <[email protected]>
The patch is based on git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next
--- drivers/input/tablet/wacom.h | 1 + drivers/input/tablet/wacom_wac.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-)
drivers/input/tablet/wacom.h +1 -0
@@ -103,6 +103,7 @@ MODULE_DESCRIPTION(DRIVER_DESC);MODULE_LICENSE (DRIVER_LICENSE );#define USB_VENDOR_ID_WACOM 0x056a +#define USB_VENDOR_ID_LENOVO 0x17efstruct wacom {dma_addr_t data_dma;
drivers/input/tablet/wacom_wac.c +7 -0
@@ -1424,11 +1424,17 @@ static struct wacom_features wacom_features_0xD2 = { "Wacom Bamboo Craft", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT };static struct wacom_features wacom_features_0xD3 = {"Wacom Bamboo 2FG 6x8" ,WACOM_PKGLEN_BBFUN ,21648 ,13530 ,1023 ,63 ,BAMBOO_PT }; +static const struct wacom_features wacom_features_0x6004 = + {"ISD-V4" ,WACOM_PKGLEN_GRAPHIRE ,12800 ,8000 ,255 ,0 ,TABLETPC };#define USB_DEVICE_WACOM (prod) \ USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \ .driver_info = (kernel_ulong_t)&wacom_features_##prod +#define USB_DEVICE_LENOVO (prod) \ + USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ + .driver_info = (kernel_ulong_t)&wacom_features_##prod +const struct usb_device_id wacom_ids[] = { {USB_DEVICE_WACOM (0x00 ) }, { USB_DEVICE_WACOM(0x10) },
@@ -1501,6 +1507,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0xE2) }, { USB_DEVICE_WACOM(0xE3) }, { USB_DEVICE_WACOM(0x47) }, + { USB_DEVICE_LENOVO(0x6004) }, { } };MODULE_DEVICE_TABLE (usb, wacom_ids);
Signature · 1 line
1.7.3.4
Dmitry Torokhov
maintainerQuoted 6 lines · Ping Cheng
From: Ajay Ramaswamy <[email protected]>
The patch is based on
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.gitnextSigned-off-by Ajay Ramaswamy <[email protected]>Reviewed-by Ping Cheng <[email protected]>
Don't we need to add HID blacklist for this as well?
Quoted 50 lines
--- drivers/input/tablet/wacom.h | 1 + drivers/input/tablet/wacom_wac.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-)drivers/input/tablet/wacom.h +1
-0@@ -103,6 +103,7 @@ MODULE_DESCRIPTION(DRIVER_DESC);MODULE_LICENSE (DRIVER_LICENSE );#define USB_VENDOR_ID_WACOM 0x056a +#define USB_VENDOR_ID_LENOVO 0x17efstruct wacom {dma_addr_t data_dma;drivers/input/tablet/wacom_wac.c +7
-0@@ -1424,11 +1424,17 @@ static struct wacom_features wacom_features_0xD2 = { "Wacom Bamboo Craft", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT };static struct wacom_features wacom_features_0xD3 = {"Wacom Bamboo 2FG 6x8" ,WACOM_PKGLEN_BBFUN ,21648 ,13530 ,1023 ,63 ,BAMBOO_PT }; +static const struct wacom_features wacom_features_0x6004 = + {"ISD-V4" ,WACOM_PKGLEN_GRAPHIRE ,12800 ,8000 ,255 ,0 ,TABLETPC };#define USB_DEVICE_WACOM (prod) \ USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \ .driver_info = (kernel_ulong_t)&wacom_features_##prod +#define USB_DEVICE_LENOVO (prod) \ + USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ + .driver_info = (kernel_ulong_t)&wacom_features_##prod +const struct usb_device_id wacom_ids[] = { {USB_DEVICE_WACOM (0x00 ) }, { USB_DEVICE_WACOM(0x10) },@@ -1501,6 +1507,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0xE2) }, { USB_DEVICE_WACOM(0xE3) }, { USB_DEVICE_WACOM(0x47) }, + { USB_DEVICE_LENOVO(0x6004) }, { } };MODULE_DEVICE_TABLE (usb, wacom_ids);Signature · 1 line
1.7.3.4
Signature · 1 line
Dmitry
Quoted 9 lines · Dmitry Torokhov
Quoted 6 lines · Ping Cheng
From: Ajay Ramaswamy <[email protected]>
The patch is based on
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.gitnextSigned-off-by Ajay Ramaswamy <[email protected]>Reviewed-by Ping Cheng <[email protected]>Don't we need to add HID blacklist for this as well?
I thought about that as well (I don't have a system to test with). Ajay told me that he did not need to do anything in hid-core.c for his tablet to work. He has been using/testing the tablet for more than 4 months.
Hopefully, we'll get more feedback from the community when the patch gets in the tree.
Thank you.
Ping
Quoted 45 lines
Quoted 45 lines
---
drivers/input/tablet/wacom.h | 1 +
drivers/input/tablet/wacom_wac.c | 7 +++++++2 files changed, 8 insertions(+), 0 deletions(-)drivers/input/tablet/wacom.h +1
-0@@ -103,6 +103,7 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE(DRIVER_LICENSE); #define USB_VENDOR_ID_WACOM 0x056a +#define USB_VENDOR_ID_LENOVO 0x17ef struct wacom { dma_addr_t data_dma;drivers/input/tablet/wacom_wac.c +0
-0@@ -1424,11 +1424,17 @@ static struct wacom_features wacom_features_0xD2 = { "Wacom Bamboo Craft", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT };static struct
wacom_featureswacom_features_0xD3=
{ "Wacom Bamboo 2FG 6x8",WACOM_PKGLEN_BBFUN, 21648, 13530, 1023, 63,BAMBOO_PT}; +static const structwacom_featureswacom_features_0x6004=
+ { "ISD-V4",WACOM_PKGLEN_GRAPHIRE, 12800, 8000, 255, 0, TABLETPC };#define
USB_DEVICE_WACOM(prod)\
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
.driver_info = (kernel_ulong_t)&wacom_features_##proddrivers/input/tablet/wacom_wac.c +4
-0+#define USB_DEVICE_LENOVO (prod) \ + USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ + .driver_info = (kernel_ulong_t)&wacom_features_##prod +const struct
usb_device_idwacom_ids[] = {
{USB_DEVICE_WACOM(0x00)},
{USB_DEVICE_WACOM(0x10)},drivers/input/tablet/wacom_wac.c +1
-0@@ -1501,6 +1507,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0xE2) }, { USB_DEVICE_WACOM(0xE3) }, { USB_DEVICE_WACOM(0x47) }, + { USB_DEVICE_LENOVO(0x6004) }, { }
Quoted 9 lines
Quoted 5 lines
drivers/input/tablet/wacom_wac.c +0
-1}; MODULE_DEVICE_TABLE(usb, wacom_ids); --1.7.3.4
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov
maintainerQuoted 12 lines · Ping Cheng
Quoted 9 lines · Dmitry Torokhov
Quoted 6 lines · Ping Cheng
From: Ajay Ramaswamy <[email protected]>
The patch is based on
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.gitnextSigned-off-by Ajay Ramaswamy <[email protected]>Reviewed-by Ping Cheng <[email protected]>Don't we need to add HID blacklist for this as well?
Quoted 8 lines
I thought about that as well (I don't have a system to test with). Ajay told me that he did not need to do anything in
hid-core.cfor his tablet to work. He has been using/testing the tablet for more than 4 months.Hopefully, we'll get more feedback from the community when the patch gets in the tree.
OK, fair enough, applied.
Thanks everyone.
Signature · 1 line
Dmitry