| Message ID | 1424699565-138045-2-git-send-email-mika.westerberg@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
On Feb 23 2015 or thereabouts, Mika Westerberg wrote: > 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> > --- This one is Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> And can be applied right now I guess. Cheers, Benjamin > drivers/hid/wacom_wac.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > index 1a6507999a65..c8e73bf62468 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 = > HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ > .driver_data = (kernel_ulong_t)&wacom_features_##prod > > +#define I2C_DEVICE_WACOM(prod) \ > + HID_DEVICE(BUS_I2C, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ > + .driver_data = (kernel_ulong_t)&wacom_features_##prod > + > #define USB_DEVICE_LENOVO(prod) \ > HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ > .driver_data = (kernel_ulong_t)&wacom_features_##prod > @@ -3113,6 +3117,7 @@ const struct hid_device_id wacom_ids[] = { > { USB_DEVICE_LENOVO(0x6004) }, > > { USB_DEVICE_WACOM(HID_ANY_ID) }, > + { I2C_DEVICE_WACOM(HID_ANY_ID) }, > { } > }; > MODULE_DEVICE_TABLE(hid, wacom_ids); > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 23 Feb 2015, Mika Westerberg wrote: > 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> Applied, thanks. > --- > drivers/hid/wacom_wac.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > index 1a6507999a65..c8e73bf62468 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 = > HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ > .driver_data = (kernel_ulong_t)&wacom_features_##prod > > +#define I2C_DEVICE_WACOM(prod) \ > + HID_DEVICE(BUS_I2C, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ > + .driver_data = (kernel_ulong_t)&wacom_features_##prod > + > #define USB_DEVICE_LENOVO(prod) \ > HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ > .driver_data = (kernel_ulong_t)&wacom_features_##prod > @@ -3113,6 +3117,7 @@ const struct hid_device_id wacom_ids[] = { > { USB_DEVICE_LENOVO(0x6004) }, > > { USB_DEVICE_WACOM(HID_ANY_ID) }, > + { I2C_DEVICE_WACOM(HID_ANY_ID) }, > { } > }; > MODULE_DEVICE_TABLE(hid, wacom_ids); > -- > 2.1.4 >
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 1a6507999a65..c8e73bf62468 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 = HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ .driver_data = (kernel_ulong_t)&wacom_features_##prod +#define I2C_DEVICE_WACOM(prod) \ + HID_DEVICE(BUS_I2C, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ + .driver_data = (kernel_ulong_t)&wacom_features_##prod + #define USB_DEVICE_LENOVO(prod) \ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ .driver_data = (kernel_ulong_t)&wacom_features_##prod @@ -3113,6 +3117,7 @@ const struct hid_device_id wacom_ids[] = { { USB_DEVICE_LENOVO(0x6004) }, { USB_DEVICE_WACOM(HID_ANY_ID) }, + { I2C_DEVICE_WACOM(HID_ANY_ID) }, { } }; MODULE_DEVICE_TABLE(hid, wacom_ids);
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> --- drivers/hid/wacom_wac.c | 5 +++++ 1 file changed, 5 insertions(+)