8 files changed, 94 insertions, 37 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 8067b653f8bf..147223993b86 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -112,6 +112,13 @@ config HID_MICROSOFT
         Support for some Microsoft devices which breaks less or more
         HID specification.
 
+config HID_SUNPLUS
+        tristate "Sunplus"
+        default m
+        depends on USB_HID
+        ---help---
+        Support for Sunplus WDesktop input device.
+
 endmenu
 
 endif # HID_SUPPORT
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 3dc2828fb719..314d5b0c70d5 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -15,6 +15,7 @@ endif
 obj-$(CONFIG_HID_APPLE)         += hid-apple.o
 obj-$(CONFIG_HID_LOGITECH)      += hid-logitech.o
 obj-$(CONFIG_HID_MICROSOFT)     += hid-microsoft.o
+obj-$(CONFIG_HID_SUNPLUS)       += hid-sunplus.o
 
 obj-$(CONFIG_USB_HID)           += usbhid/
 obj-$(CONFIG_USB_MOUSE)         += usbhid/
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index db8fbd2f5028..e9e6dbbaaa83 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1181,6 +1181,7 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },
         { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },
         { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
 
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
diff --git a/drivers/hid/hid-dummy.c b/drivers/hid/hid-dummy.c
index fe64d60f9010..0c833d920c3d 100644
--- a/drivers/hid/hid-dummy.c
+++ b/drivers/hid/hid-dummy.c
@@ -13,6 +13,9 @@ static int __init hid_dummy_init(void)
 #ifdef CONFIG_HID_MICROSOFT_MODULE
         HID_COMPAT_CALL_DRIVER(microsoft);
 #endif
+#ifdef CONFIG_HID_SUNPLUS_MODULE
+        HID_COMPAT_CALL_DRIVER(sunplus);
+#endif
 
         return -EIO;
 }
diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
index d1b4f093dcb3..a5e7163158fb 100644
--- a/drivers/hid/hid-input-quirks.c
+++ b/drivers/hid/hid-input-quirks.c
@@ -170,21 +170,6 @@ static int quirk_btc_8193(struct hid_usage *usage, struct hid_input *hidinput,
         return 1;
 }
 
-static int quirk_sunplus_wdesktop(struct hid_usage *usage,
-                struct hid_input *hidinput, unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
-                return 0;
-
-        switch (usage->hid & HID_USAGE) {
-                case 0x2003: map_key_clear(KEY_ZOOMIN);         break;
-                case 0x2103: map_key_clear(KEY_ZOOMOUT);        break;
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
 #define VENDOR_ID_BELKIN                        0x1020
 #define DEVICE_ID_BELKIN_WIRELESS_KEYBOARD      0x0006
 
@@ -206,9 +191,6 @@ static int quirk_sunplus_wdesktop(struct hid_usage *usage,
 #define VENDOR_ID_PETALYNX                      0x18b1
 #define DEVICE_ID_PETALYNX_MAXTER_REMOTE        0x0037
 
-#define VENDOR_ID_SUNPLUS                       0x04fc
-#define DEVICE_ID_SUNPLUS_WDESKTOP              0x05d8
-
 static const struct hid_input_blacklist {
         __u16 idVendor;
         __u16 idProduct;
@@ -229,8 +211,6 @@ static const struct hid_input_blacklist {
 
         { VENDOR_ID_PETALYNX, DEVICE_ID_PETALYNX_MAXTER_REMOTE, quirk_petalynx_remote },
 
-        { VENDOR_ID_SUNPLUS, DEVICE_ID_SUNPLUS_WDESKTOP, quirk_sunplus_wdesktop },
-
         { 0, 0, NULL }
 };
 
diff --git a/drivers/hid/hid-sunplus.c b/drivers/hid/hid-sunplus.c
new file mode 100644
index 000000000000..5ba68f7dbb78
--- /dev/null
+++ b/drivers/hid/hid-sunplus.c
@@ -0,0 +1,82 @@
+/*
+ *  HID driver for some sunplus "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+static void sp_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        if (rsize >= 107 && rdesc[104] == 0x26 && rdesc[105] == 0x80 &&
+                        rdesc[106] == 0x03) {
+                dev_info(&hdev->dev, "fixing up Sunplus Wireless Desktop "
+                                "report descriptor\n");
+                rdesc[105] = rdesc[110] = 0x03;
+                rdesc[106] = rdesc[111] = 0x21;
+        }
+}
+
+#define sp_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                EV_KEY, (c))
+static int sp_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+                return 0;
+
+        switch (usage->hid & HID_USAGE) {
+        case 0x2003: sp_map_key_clear(KEY_ZOOMIN);              break;
+        case 0x2103: sp_map_key_clear(KEY_ZOOMOUT);     break;
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static const struct hid_device_id sp_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, sp_devices);
+
+static struct hid_driver sp_driver = {
+        .name = "sunplus",
+        .id_table = sp_devices,
+        .report_fixup = sp_report_fixup,
+        .input_mapping = sp_input_mapping,
+};
+
+static int sp_init(void)
+{
+        return hid_register_driver(&sp_driver);
+}
+
+static void sp_exit(void)
+{
+        hid_unregister_driver(&sp_driver);
+}
+
+module_init(sp_init);
+module_exit(sp_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(sunplus);
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 1614ed2efc15..7f38c21e146b 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -93,8 +93,6 @@ static const struct hid_rdesc_blacklist {
 
         { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE },
 
-        { USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP, HID_QUIRK_RDESC_SUNPLUS_WDESKTOP },
-
         { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1, HID_QUIRK_RDESC_SWAPPED_MIN_MAX },
         { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2, HID_QUIRK_RDESC_SWAPPED_MIN_MAX },
 
@@ -342,17 +340,6 @@ static void usbhid_fixup_cymotion_descriptor(char *rdesc, int rsize)
         }
 }
 
-static void usbhid_fixup_sunplus_wdesktop(unsigned char *rdesc, int rsize)
-{
-        if (rsize >= 107 && rdesc[104] == 0x26
-                         && rdesc[105] == 0x80
-                         && rdesc[106] == 0x03) {
-                printk(KERN_INFO "Fixing up Sunplus Wireless Desktop report descriptor\n");
-                rdesc[105] = rdesc[110] = 0x03;
-                rdesc[106] = rdesc[111] = 0x21;
-        }
-}
-
 /*
  * Samsung IrDA remote controller (reports as Cypress USB Mouse).
  *
@@ -444,9 +431,6 @@ static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned
 
         if (quirks & HID_QUIRK_RDESC_SAMSUNG_REMOTE)
                 usbhid_fixup_samsung_irda_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_RDESC_SUNPLUS_WDESKTOP)
-                usbhid_fixup_sunplus_wdesktop(rdesc, rsize);
 }
 
 /**
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 1f1edd886ef8..a83d211021de 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -282,7 +282,6 @@ struct hid_item {
 #define HID_QUIRK_RDESC_PETALYNX                0x00000008
 #define HID_QUIRK_RDESC_BUTTON_CONSUMER         0x00000020
 #define HID_QUIRK_RDESC_SAMSUNG_REMOTE          0x00000040
-#define HID_QUIRK_RDESC_SUNPLUS_WDESKTOP        0x00000100
 
 /*
  * This is the global environment of the parser. This information is