HID: hid-multitouch: migrate support for Stantum panels to the unified driver.

This patch merges hid-stantum to the generic multitouch driver.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Reviewed-by: Stéphane Chatty <chatty@enac.fr>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index d00232d..180e33e 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -302,6 +302,7 @@ config HID_MULTITOUCH
          - 'Sensing Win7-TwoFinger' panel by GeneralTouch
           - eGalax dual-touch panels, including the
            Joojoo and Wetab tablets
+         - Stantum multitouch panels
 
          If unsure, say N.
 
@@ -446,12 +447,6 @@ config HID_SONY
        ---help---
        Support for Sony PS3 controller.
 
-config HID_STANTUM
-       tristate "Stantum multitouch panel"
-       depends on USB_HID
-       ---help---
-       Support for Stantum multitouch panel.
-
 config HID_SUNPLUS
        tristate "Sunplus wireless desktop"
        depends on USB_HID

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 29e9898..62d66eb 100644 (file)
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -61,7 +61,6 @@ obj-$(CONFIG_HID_ROCCAT_PYRA) += hid-roccat-pyra.o
 obj-$(CONFIG_HID_SAMSUNG)      += hid-samsung.o
 obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
 obj-$(CONFIG_HID_SONY)         += hid-sony.o
-obj-$(CONFIG_HID_STANTUM)      += hid-stantum.o
 obj-$(CONFIG_HID_SUNPLUS)      += hid-sunplus.o
 obj-$(CONFIG_HID_GREENASIA)    += hid-gaff.o
 obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index af5a709..4d32f3d 100644 (file)
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -78,6 +78,7 @@ struct mt_class {
 #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER      3
 #define MT_CLS_CYPRESS                         4
 #define MT_CLS_EGALAX                          5
+#define MT_CLS_STANTUM                         6
 
 /*
  * these device-dependent functions determine what slot corresponds
@@ -136,6 +137,9 @@ struct mt_class mt_classes[] = {
                .sn_move = 4096,
                .sn_pressure = 32,
        },
+       { .name = MT_CLS_STANTUM,
+               .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
+
        { }
 };
 
@@ -530,6 +534,17 @@ static const struct hid_device_id mt_devices[] = {
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
 
+       /* Stantum panels */
+       { .driver_data = MT_CLS_STANTUM,
+               HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
+                       USB_DEVICE_ID_MTP)},
+       { .driver_data = MT_CLS_STANTUM,
+               HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
+                       USB_DEVICE_ID_MTP_STM)},
+       { .driver_data = MT_CLS_STANTUM,
+               HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
+                       USB_DEVICE_ID_MTP_SITRONIX)},
+
        { }
 };
 MODULE_DEVICE_TABLE(hid, mt_devices);