diff mbox series

HID: multitouch: Remove MT_CLS_WIN_8_DUAL

Message ID 20200414091842.25972-1-kai.heng.feng@canonical.com
State New
Delegated to: Jiri Kosina
Headers show
Series HID: multitouch: Remove MT_CLS_WIN_8_DUAL | expand

Commit Message

Kai-Heng Feng April 14, 2020, 9:18 a.m. UTC
After commit c23e2043d5f7 ("HID: multitouch: do not filter mice nodes"),
MT_CLS_WIN_8 also supports mouse nodes, hence make MT_CLS_WIN_8_DUAL
redundant.

Remove MT_CLS_WIN_8_DUAL accordingly.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/hid/hid-ids.h        |  9 --------
 drivers/hid/hid-multitouch.c | 45 ++----------------------------------
 2 files changed, 2 insertions(+), 52 deletions(-)

Comments

Kai-Heng Feng May 8, 2020, 5:33 a.m. UTC | #1
> On Apr 14, 2020, at 17:18, Kai-Heng Feng <kai.heng.feng@canonical.com> wrote:
> 
> After commit c23e2043d5f7 ("HID: multitouch: do not filter mice nodes"),
> MT_CLS_WIN_8 also supports mouse nodes, hence make MT_CLS_WIN_8_DUAL
> redundant.
> 
> Remove MT_CLS_WIN_8_DUAL accordingly.

A gentle ping...

> 
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
> drivers/hid/hid-ids.h        |  9 --------
> drivers/hid/hid-multitouch.c | 45 ++----------------------------------
> 2 files changed, 2 insertions(+), 52 deletions(-)
> 
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index b18b13147a6f..7134389afd2e 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -76,12 +76,8 @@
> 
> #define USB_VENDOR_ID_ALPS_JP		0x044E
> #define HID_DEVICE_ID_ALPS_U1_DUAL	0x120B
> -#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP	0x121F
> -#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP	0x1220
> #define HID_DEVICE_ID_ALPS_U1		0x1215
> #define HID_DEVICE_ID_ALPS_T4_BTNLESS	0x120C
> -#define HID_DEVICE_ID_ALPS_1222		0x1222
> -
> 
> #define USB_VENDOR_ID_AMI		0x046b
> #define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE	0xff10
> @@ -281,9 +277,6 @@
> 
> #define USB_VENDOR_ID_CIDC		0x1677
> 
> -#define I2C_VENDOR_ID_CIRQUE		0x0488
> -#define I2C_PRODUCT_ID_CIRQUE_121F	0x121F
> -
> #define USB_VENDOR_ID_CJTOUCH		0x24b8
> #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020	0x0020
> #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040	0x0040
> @@ -729,8 +722,6 @@
> #define USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL	0x6049
> #define USB_DEVICE_ID_LENOVO_TPPRODOCK	0x6067
> #define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085
> -#define USB_DEVICE_ID_LENOVO_X1_TAB	0x60a3
> -#define USB_DEVICE_ID_LENOVO_X1_TAB3	0x60b5
> #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d
> 
> #define USB_VENDOR_ID_LG		0x1fd2
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 362805ddf377..bcd37abb2a4a 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -188,7 +188,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
> /* reserved					0x0011 */
> #define MT_CLS_WIN_8				0x0012
> #define MT_CLS_EXPORT_ALL_INPUTS		0x0013
> -#define MT_CLS_WIN_8_DUAL			0x0014
> +/* reserved					0x0014 */
> 
> /* vendor specific classes */
> #define MT_CLS_3M				0x0101
> @@ -272,14 +272,6 @@ static const struct mt_class mt_classes[] = {
> 		.quirks = MT_QUIRK_ALWAYS_VALID |
> 			MT_QUIRK_CONTACT_CNT_ACCURATE,
> 		.export_all_inputs = true },
> -	{ .name = MT_CLS_WIN_8_DUAL,
> -		.quirks = MT_QUIRK_ALWAYS_VALID |
> -			MT_QUIRK_IGNORE_DUPLICATES |
> -			MT_QUIRK_HOVERING |
> -			MT_QUIRK_CONTACT_CNT_ACCURATE |
> -			MT_QUIRK_WIN8_PTP_BUTTONS,
> -		.export_all_inputs = true },
> -
> 	/*
> 	 * vendor specific classes
> 	 */
> @@ -754,8 +746,7 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
> 			MT_STORE_FIELD(inrange_state);
> 			return 1;
> 		case HID_DG_CONFIDENCE:
> -			if ((cls->name == MT_CLS_WIN_8 ||
> -				cls->name == MT_CLS_WIN_8_DUAL) &&
> +			if (cls->name == MT_CLS_WIN_8 &&
> 				(field->application == HID_DG_TOUCHPAD ||
> 				 field->application == HID_DG_TOUCHSCREEN))
> 				app->quirks |= MT_QUIRK_CONFIDENCE;
> @@ -1786,32 +1777,6 @@ static const struct hid_device_id mt_devices[] = {
> 		MT_USB_DEVICE(USB_VENDOR_ID_3M,
> 			USB_DEVICE_ID_3M3266) },
> 
> -	/* Alps devices */
> -	{ .driver_data = MT_CLS_WIN_8_DUAL,
> -		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
> -			USB_VENDOR_ID_ALPS_JP,
> -			HID_DEVICE_ID_ALPS_U1_DUAL_PTP) },
> -	{ .driver_data = MT_CLS_WIN_8_DUAL,
> -		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
> -			USB_VENDOR_ID_ALPS_JP,
> -			HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },
> -	{ .driver_data = MT_CLS_WIN_8_DUAL,
> -		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
> -			USB_VENDOR_ID_ALPS_JP,
> -			HID_DEVICE_ID_ALPS_1222) },
> -
> -	/* Lenovo X1 TAB Gen 2 */
> -	{ .driver_data = MT_CLS_WIN_8_DUAL,
> -		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
> -			   USB_VENDOR_ID_LENOVO,
> -			   USB_DEVICE_ID_LENOVO_X1_TAB) },
> -
> -	/* Lenovo X1 TAB Gen 3 */
> -	{ .driver_data = MT_CLS_WIN_8_DUAL,
> -		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
> -			   USB_VENDOR_ID_LENOVO,
> -			   USB_DEVICE_ID_LENOVO_X1_TAB3) },
> -
> 	/* Anton devices */
> 	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
> 		MT_USB_DEVICE(USB_VENDOR_ID_ANTON,
> @@ -1846,12 +1811,6 @@ static const struct hid_device_id mt_devices[] = {
> 		MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,
> 			USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
> 
> -	/* Cirque devices */
> -	{ .driver_data = MT_CLS_WIN_8_DUAL,
> -		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
> -			I2C_VENDOR_ID_CIRQUE,
> -			I2C_PRODUCT_ID_CIRQUE_121F) },
> -
> 	/* CJTouch panels */
> 	{ .driver_data = MT_CLS_NSMU,
> 		MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
> -- 
> 2.17.1
>
Jiri Kosina May 26, 2020, 8:23 a.m. UTC | #2
On Tue, 14 Apr 2020, Kai-Heng Feng wrote:

> After commit c23e2043d5f7 ("HID: multitouch: do not filter mice nodes"),
> MT_CLS_WIN_8 also supports mouse nodes, hence make MT_CLS_WIN_8_DUAL
> redundant.
> 
> Remove MT_CLS_WIN_8_DUAL accordingly.

Benjamin, can I get your Ack on this one please?

Thanks,
Benjamin Tissoires May 26, 2020, 8:43 a.m. UTC | #3
On Tue, May 26, 2020 at 10:24 AM Jiri Kosina <jikos@kernel.org> wrote:
>
> On Tue, 14 Apr 2020, Kai-Heng Feng wrote:
>
> > After commit c23e2043d5f7 ("HID: multitouch: do not filter mice nodes"),
> > MT_CLS_WIN_8 also supports mouse nodes, hence make MT_CLS_WIN_8_DUAL
> > redundant.
> >
> > Remove MT_CLS_WIN_8_DUAL accordingly.
>
> Benjamin, can I get your Ack on this one please?

Heh, funny enough I was trying to fix
https://bugzilla.kernel.org/show_bug.cgi?id=207235 and was pondering
this one too.

To fix #207235, I'll likely need to add a new class and quirk in
hid-multitouch. I can't really find a generic solution for now, and we
better have a local quirk for the 2 devices we currently have and
backport those to stable. However, this patch will likely conflict
(trivially), with the new quirks, so I was thinking:
- submitting my quick and dirty quirk and mark it to stable
- apply this one on top of it (this one really doesn't need to go to stable)

How does that sound?

Cheers,
Benjamin

>
> Thanks,
>
> --
> Jiri Kosina
> SUSE Labs
>
Kai-Heng Feng May 27, 2020, 6:19 a.m. UTC | #4
> On May 26, 2020, at 16:43, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote:
> 
> On Tue, May 26, 2020 at 10:24 AM Jiri Kosina <jikos@kernel.org> wrote:
>> 
>> On Tue, 14 Apr 2020, Kai-Heng Feng wrote:
>> 
>>> After commit c23e2043d5f7 ("HID: multitouch: do not filter mice nodes"),
>>> MT_CLS_WIN_8 also supports mouse nodes, hence make MT_CLS_WIN_8_DUAL
>>> redundant.
>>> 
>>> Remove MT_CLS_WIN_8_DUAL accordingly.
>> 
>> Benjamin, can I get your Ack on this one please?
> 
> Heh, funny enough I was trying to fix
> https://bugzilla.kernel.org/show_bug.cgi?id=207235 and was pondering
> this one too.
> 
> To fix #207235, I'll likely need to add a new class and quirk in
> hid-multitouch. I can't really find a generic solution for now, and we
> better have a local quirk for the 2 devices we currently have and
> backport those to stable. However, this patch will likely conflict
> (trivially), with the new quirks, so I was thinking:
> - submitting my quick and dirty quirk and mark it to stable
> - apply this one on top of it (this one really doesn't need to go to stable)
> 
> How does that sound?

Sounds good. I'll resend this patch once your patch lands in the tree.

Kai-Heng

> 
> Cheers,
> Benjamin
> 
>> 
>> Thanks,
>> 
>> --
>> Jiri Kosina
>> SUSE Labs
>> 
>
Benjamin Tissoires May 27, 2020, 9:24 a.m. UTC | #5
On Wed, May 27, 2020 at 8:19 AM Kai-Heng Feng
<kai.heng.feng@canonical.com> wrote:
>
>
>
> > On May 26, 2020, at 16:43, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote:
> >
> > On Tue, May 26, 2020 at 10:24 AM Jiri Kosina <jikos@kernel.org> wrote:
> >>
> >> On Tue, 14 Apr 2020, Kai-Heng Feng wrote:
> >>
> >>> After commit c23e2043d5f7 ("HID: multitouch: do not filter mice nodes"),
> >>> MT_CLS_WIN_8 also supports mouse nodes, hence make MT_CLS_WIN_8_DUAL
> >>> redundant.
> >>>
> >>> Remove MT_CLS_WIN_8_DUAL accordingly.
> >>
> >> Benjamin, can I get your Ack on this one please?
> >
> > Heh, funny enough I was trying to fix
> > https://bugzilla.kernel.org/show_bug.cgi?id=207235 and was pondering
> > this one too.
> >
> > To fix #207235, I'll likely need to add a new class and quirk in
> > hid-multitouch. I can't really find a generic solution for now, and we
> > better have a local quirk for the 2 devices we currently have and
> > backport those to stable. However, this patch will likely conflict
> > (trivially), with the new quirks, so I was thinking:
> > - submitting my quick and dirty quirk and mark it to stable
> > - apply this one on top of it (this one really doesn't need to go to stable)
> >
> > How does that sound?
>
> Sounds good. I'll resend this patch once your patch lands in the tree.

Great, thanks. Though I should be able to rebase it and push it
directly. I'll notify you if I can't get to it today.

Cheers,
Benjamin

>
> Kai-Heng
>
> >
> > Cheers,
> > Benjamin
> >
> >>
> >> Thanks,
> >>
> >> --
> >> Jiri Kosina
> >> SUSE Labs
> >>
> >
>
Benjamin Tissoires May 27, 2020, 12:15 p.m. UTC | #6
On Wed, May 27, 2020 at 11:24 AM Benjamin Tissoires
<benjamin.tissoires@redhat.com> wrote:
>
> On Wed, May 27, 2020 at 8:19 AM Kai-Heng Feng
> <kai.heng.feng@canonical.com> wrote:
> >
> >
> >
> > > On May 26, 2020, at 16:43, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote:
> > >
> > > On Tue, May 26, 2020 at 10:24 AM Jiri Kosina <jikos@kernel.org> wrote:
> > >>
> > >> On Tue, 14 Apr 2020, Kai-Heng Feng wrote:
> > >>
> > >>> After commit c23e2043d5f7 ("HID: multitouch: do not filter mice nodes"),
> > >>> MT_CLS_WIN_8 also supports mouse nodes, hence make MT_CLS_WIN_8_DUAL
> > >>> redundant.
> > >>>
> > >>> Remove MT_CLS_WIN_8_DUAL accordingly.
> > >>
> > >> Benjamin, can I get your Ack on this one please?
> > >
> > > Heh, funny enough I was trying to fix
> > > https://bugzilla.kernel.org/show_bug.cgi?id=207235 and was pondering
> > > this one too.
> > >
> > > To fix #207235, I'll likely need to add a new class and quirk in
> > > hid-multitouch. I can't really find a generic solution for now, and we
> > > better have a local quirk for the 2 devices we currently have and
> > > backport those to stable. However, this patch will likely conflict
> > > (trivially), with the new quirks, so I was thinking:
> > > - submitting my quick and dirty quirk and mark it to stable
> > > - apply this one on top of it (this one really doesn't need to go to stable)
> > >
> > > How does that sound?
> >
> > Sounds good. I'll resend this patch once your patch lands in the tree.
>
> Great, thanks. Though I should be able to rebase it and push it
> directly. I'll notify you if I can't get to it today.

Alright, rebased and pushed to for-5.8/multitouch.

Thanks a lot.

Cheers,
Benjamin

>
> Cheers,
> Benjamin
>
> >
> > Kai-Heng
> >
> > >
> > > Cheers,
> > > Benjamin
> > >
> > >>
> > >> Thanks,
> > >>
> > >> --
> > >> Jiri Kosina
> > >> SUSE Labs
> > >>
> > >
> >
Kai-Heng Feng May 28, 2020, 9:36 a.m. UTC | #7
> On May 27, 2020, at 20:15, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote:
> 
> On Wed, May 27, 2020 at 11:24 AM Benjamin Tissoires
> <benjamin.tissoires@redhat.com> wrote:
>> 
>> On Wed, May 27, 2020 at 8:19 AM Kai-Heng Feng
>> <kai.heng.feng@canonical.com> wrote:
>>> 
>>> 
>>> 
>>>> On May 26, 2020, at 16:43, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote:
>>>> 
>>>> On Tue, May 26, 2020 at 10:24 AM Jiri Kosina <jikos@kernel.org> wrote:
>>>>> 
>>>>> On Tue, 14 Apr 2020, Kai-Heng Feng wrote:
>>>>> 
>>>>>> After commit c23e2043d5f7 ("HID: multitouch: do not filter mice nodes"),
>>>>>> MT_CLS_WIN_8 also supports mouse nodes, hence make MT_CLS_WIN_8_DUAL
>>>>>> redundant.
>>>>>> 
>>>>>> Remove MT_CLS_WIN_8_DUAL accordingly.
>>>>> 
>>>>> Benjamin, can I get your Ack on this one please?
>>>> 
>>>> Heh, funny enough I was trying to fix
>>>> https://bugzilla.kernel.org/show_bug.cgi?id=207235 and was pondering
>>>> this one too.
>>>> 
>>>> To fix #207235, I'll likely need to add a new class and quirk in
>>>> hid-multitouch. I can't really find a generic solution for now, and we
>>>> better have a local quirk for the 2 devices we currently have and
>>>> backport those to stable. However, this patch will likely conflict
>>>> (trivially), with the new quirks, so I was thinking:
>>>> - submitting my quick and dirty quirk and mark it to stable
>>>> - apply this one on top of it (this one really doesn't need to go to stable)
>>>> 
>>>> How does that sound?
>>> 
>>> Sounds good. I'll resend this patch once your patch lands in the tree.
>> 
>> Great, thanks. Though I should be able to rebase it and push it
>> directly. I'll notify you if I can't get to it today.
> 
> Alright, rebased and pushed to for-5.8/multitouch.
> 
> Thanks a lot.

Thanks for your work :)

Kai-Heng

> 
> Cheers,
> Benjamin
> 
>> 
>> Cheers,
>> Benjamin
>> 
>>> 
>>> Kai-Heng
>>> 
>>>> 
>>>> Cheers,
>>>> Benjamin
>>>> 
>>>>> 
>>>>> Thanks,
>>>>> 
>>>>> --
>>>>> Jiri Kosina
>>>>> SUSE Labs
diff mbox series

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b18b13147a6f..7134389afd2e 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -76,12 +76,8 @@ 
 
 #define USB_VENDOR_ID_ALPS_JP		0x044E
 #define HID_DEVICE_ID_ALPS_U1_DUAL	0x120B
-#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP	0x121F
-#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP	0x1220
 #define HID_DEVICE_ID_ALPS_U1		0x1215
 #define HID_DEVICE_ID_ALPS_T4_BTNLESS	0x120C
-#define HID_DEVICE_ID_ALPS_1222		0x1222
-
 
 #define USB_VENDOR_ID_AMI		0x046b
 #define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE	0xff10
@@ -281,9 +277,6 @@ 
 
 #define USB_VENDOR_ID_CIDC		0x1677
 
-#define I2C_VENDOR_ID_CIRQUE		0x0488
-#define I2C_PRODUCT_ID_CIRQUE_121F	0x121F
-
 #define USB_VENDOR_ID_CJTOUCH		0x24b8
 #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020	0x0020
 #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040	0x0040
@@ -729,8 +722,6 @@ 
 #define USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL	0x6049
 #define USB_DEVICE_ID_LENOVO_TPPRODOCK	0x6067
 #define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085
-#define USB_DEVICE_ID_LENOVO_X1_TAB	0x60a3
-#define USB_DEVICE_ID_LENOVO_X1_TAB3	0x60b5
 #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d
 
 #define USB_VENDOR_ID_LG		0x1fd2
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 362805ddf377..bcd37abb2a4a 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -188,7 +188,7 @@  static void mt_post_parse(struct mt_device *td, struct mt_application *app);
 /* reserved					0x0011 */
 #define MT_CLS_WIN_8				0x0012
 #define MT_CLS_EXPORT_ALL_INPUTS		0x0013
-#define MT_CLS_WIN_8_DUAL			0x0014
+/* reserved					0x0014 */
 
 /* vendor specific classes */
 #define MT_CLS_3M				0x0101
@@ -272,14 +272,6 @@  static const struct mt_class mt_classes[] = {
 		.quirks = MT_QUIRK_ALWAYS_VALID |
 			MT_QUIRK_CONTACT_CNT_ACCURATE,
 		.export_all_inputs = true },
-	{ .name = MT_CLS_WIN_8_DUAL,
-		.quirks = MT_QUIRK_ALWAYS_VALID |
-			MT_QUIRK_IGNORE_DUPLICATES |
-			MT_QUIRK_HOVERING |
-			MT_QUIRK_CONTACT_CNT_ACCURATE |
-			MT_QUIRK_WIN8_PTP_BUTTONS,
-		.export_all_inputs = true },
-
 	/*
 	 * vendor specific classes
 	 */
@@ -754,8 +746,7 @@  static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 			MT_STORE_FIELD(inrange_state);
 			return 1;
 		case HID_DG_CONFIDENCE:
-			if ((cls->name == MT_CLS_WIN_8 ||
-				cls->name == MT_CLS_WIN_8_DUAL) &&
+			if (cls->name == MT_CLS_WIN_8 &&
 				(field->application == HID_DG_TOUCHPAD ||
 				 field->application == HID_DG_TOUCHSCREEN))
 				app->quirks |= MT_QUIRK_CONFIDENCE;
@@ -1786,32 +1777,6 @@  static const struct hid_device_id mt_devices[] = {
 		MT_USB_DEVICE(USB_VENDOR_ID_3M,
 			USB_DEVICE_ID_3M3266) },
 
-	/* Alps devices */
-	{ .driver_data = MT_CLS_WIN_8_DUAL,
-		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
-			USB_VENDOR_ID_ALPS_JP,
-			HID_DEVICE_ID_ALPS_U1_DUAL_PTP) },
-	{ .driver_data = MT_CLS_WIN_8_DUAL,
-		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
-			USB_VENDOR_ID_ALPS_JP,
-			HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },
-	{ .driver_data = MT_CLS_WIN_8_DUAL,
-		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
-			USB_VENDOR_ID_ALPS_JP,
-			HID_DEVICE_ID_ALPS_1222) },
-
-	/* Lenovo X1 TAB Gen 2 */
-	{ .driver_data = MT_CLS_WIN_8_DUAL,
-		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
-			   USB_VENDOR_ID_LENOVO,
-			   USB_DEVICE_ID_LENOVO_X1_TAB) },
-
-	/* Lenovo X1 TAB Gen 3 */
-	{ .driver_data = MT_CLS_WIN_8_DUAL,
-		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
-			   USB_VENDOR_ID_LENOVO,
-			   USB_DEVICE_ID_LENOVO_X1_TAB3) },
-
 	/* Anton devices */
 	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
 		MT_USB_DEVICE(USB_VENDOR_ID_ANTON,
@@ -1846,12 +1811,6 @@  static const struct hid_device_id mt_devices[] = {
 		MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,
 			USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
 
-	/* Cirque devices */
-	{ .driver_data = MT_CLS_WIN_8_DUAL,
-		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
-			I2C_VENDOR_ID_CIRQUE,
-			I2C_PRODUCT_ID_CIRQUE_121F) },
-
 	/* CJTouch panels */
 	{ .driver_data = MT_CLS_NSMU,
 		MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,