aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2015-02-23 08:52:43 -0500
committerJiri Kosina <jkosina@suse.cz>2015-02-24 05:29:24 -0500
commiteef23a8441432960c89ee5bd034ad822ccd6658e (patch)
tree759223d5173b1da0be833266e90cb1b72cf55de9 /drivers/hid
parent9a1c001298fd567c0f0776ab54ab9965eeb9019f (diff)
HID: wacom: Add support for I2C connected devices
Lenovo Thinkpad 10 has wacom digitizer connected as a I2C-HID device. Add generic support for this. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/wacom_wac.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 8e806d308755..16e8d288e913 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2969,6 +2969,10 @@ static const struct wacom_features wacom_features_HID_ANY_ID =
2969 HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ 2969 HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\
2970 .driver_data = (kernel_ulong_t)&wacom_features_##prod 2970 .driver_data = (kernel_ulong_t)&wacom_features_##prod
2971 2971
2972#define I2C_DEVICE_WACOM(prod) \
2973 HID_DEVICE(BUS_I2C, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\
2974 .driver_data = (kernel_ulong_t)&wacom_features_##prod
2975
2972#define USB_DEVICE_LENOVO(prod) \ 2976#define USB_DEVICE_LENOVO(prod) \
2973 HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ 2977 HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \
2974 .driver_data = (kernel_ulong_t)&wacom_features_##prod 2978 .driver_data = (kernel_ulong_t)&wacom_features_##prod
@@ -3113,6 +3117,7 @@ const struct hid_device_id wacom_ids[] = {
3113 { USB_DEVICE_LENOVO(0x6004) }, 3117 { USB_DEVICE_LENOVO(0x6004) },
3114 3118
3115 { USB_DEVICE_WACOM(HID_ANY_ID) }, 3119 { USB_DEVICE_WACOM(HID_ANY_ID) },
3120 { I2C_DEVICE_WACOM(HID_ANY_ID) },
3116 { } 3121 { }
3117}; 3122};
3118MODULE_DEVICE_TABLE(hid, wacom_ids); 3123MODULE_DEVICE_TABLE(hid, wacom_ids);