7 files changed, 94 insertions, 37 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 04f646a90d32..d71507a5cccb 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -154,6 +154,13 @@ config HID_MICROSOFT
         Support for some Microsoft devices which breaks less or more
         HID specification.
 
+config HID_MONTEREY
+        tristate "Monterey"
+        default m
+        depends on USB_HID
+        ---help---
+        Support for Monterey Genius KB29E.
+
 config HID_PETALYNX
         tristate "Petalynx"
         default m
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 359a5bae4082..48b5fb25d16a 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o
 obj-$(CONFIG_HID_EZKEY)         += hid-ezkey.o
 obj-$(CONFIG_HID_LOGITECH)      += hid-logitech.o
 obj-$(CONFIG_HID_MICROSOFT)     += hid-microsoft.o
+obj-$(CONFIG_HID_MONTEREY)      += hid-monterey.o
 obj-$(CONFIG_HID_PETALYNX)      += hid-petalynx.o
 obj-$(CONFIG_HID_SUNPLUS)       += hid-sunplus.o
 
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 2b7a08fe1718..fa2723100450 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1191,6 +1191,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_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
         { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
 
diff --git a/drivers/hid/hid-dummy.c b/drivers/hid/hid-dummy.c
index c28422c9d2b5..1dbb454c8112 100644
--- a/drivers/hid/hid-dummy.c
+++ b/drivers/hid/hid-dummy.c
@@ -31,6 +31,9 @@ static int __init hid_dummy_init(void)
 #ifdef CONFIG_HID_MICROSOFT_MODULE
         HID_COMPAT_CALL_DRIVER(microsoft);
 #endif
+#ifdef CONFIG_HID_MONTEREY_MODULE
+        HID_COMPAT_CALL_DRIVER(monterey);
+#endif
 #ifdef CONFIG_HID_PETALYNX_MODULE
         HID_COMPAT_CALL_DRIVER(petalynx);
 #endif
diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
index 903162a63c4f..1a4ba0313030 100644
--- a/drivers/hid/hid-input-quirks.c
+++ b/drivers/hid/hid-input-quirks.c
@@ -42,30 +42,9 @@ static int quirk_gyration_remote(struct hid_usage *usage,
         return 1;
 }
 
-static int quirk_cherry_genius_29e(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 0x156: map_key_clear(KEY_WORDPROCESSOR);   break;
-                case 0x157: map_key_clear(KEY_SPREADSHEET);     break;
-                case 0x158: map_key_clear(KEY_PRESENTATION);    break;
-                case 0x15c: map_key_clear(KEY_STOP);            break;
-
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
 #define VENDOR_ID_GYRATION                      0x0c16
 #define DEVICE_ID_GYRATION_REMOTE               0x0002
 
-#define VENDOR_ID_MONTEREY                      0x0566
-#define DEVICE_ID_GENIUS_KB29E                  0x3004
-
 static const struct hid_input_blacklist {
         __u16 idVendor;
         __u16 idProduct;
@@ -74,8 +53,6 @@ static const struct hid_input_blacklist {
 } hid_input_blacklist[] = {
         { VENDOR_ID_GYRATION, DEVICE_ID_GYRATION_REMOTE, quirk_gyration_remote },
 
-        { VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e },
-
         { 0, 0, NULL }
 };
 
diff --git a/drivers/hid/hid-monterey.c b/drivers/hid/hid-monterey.c
new file mode 100644
index 000000000000..f3a85a065f18
--- /dev/null
+++ b/drivers/hid/hid-monterey.c
@@ -0,0 +1,82 @@
+/*
+ *  HID driver for some monterey "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 mr_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        if (rsize >= 30 && rdesc[29] == 0x05 && rdesc[30] == 0x09) {
+                dev_info(&hdev->dev, "fixing up button/consumer in HID report "
+                                "descriptor\n");
+                rdesc[30] = 0x0c;
+        }
+}
+
+#define mr_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                                        EV_KEY, (c))
+static int mr_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 0x156: mr_map_key_clear(KEY_WORDPROCESSOR);        break;
+        case 0x157: mr_map_key_clear(KEY_SPREADSHEET);          break;
+        case 0x158: mr_map_key_clear(KEY_PRESENTATION);         break;
+        case 0x15c: mr_map_key_clear(KEY_STOP);                 break;
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static const struct hid_device_id mr_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, mr_devices);
+
+static struct hid_driver mr_driver = {
+        .name = "monterey",
+        .id_table = mr_devices,
+        .report_fixup = mr_report_fixup,
+        .input_mapping = mr_input_mapping,
+};
+
+static int mr_init(void)
+{
+        return hid_register_driver(&mr_driver);
+}
+
+static void mr_exit(void)
+{
+        hid_unregister_driver(&mr_driver);
+}
+
+module_init(mr_init);
+module_exit(mr_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(monterey);
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 3f977abb62b1..cc1927b1b88a 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -75,8 +75,6 @@ static const struct hid_rdesc_blacklist {
         __u16 idProduct;
         __u32 quirks;
 } hid_rdesc_blacklist[] = {
-        { USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E, HID_QUIRK_RDESC_BUTTON_CONSUMER },
-
         { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE },
 
         { 0, 0 }
@@ -337,20 +335,8 @@ static void usbhid_fixup_samsung_irda_descriptor(unsigned char *rdesc,
         }
 }
 
-static void usbhid_fixup_button_consumer_descriptor(unsigned char *rdesc, int rsize)
-{
-        if (rsize >= 30 && rdesc[29] == 0x05
-                        && rdesc[30] == 0x09) {
-                printk(KERN_INFO "Fixing up button/consumer in HID report descriptor\n");
-                rdesc[30] = 0x0c;
-        }
-}
-
 static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize)
 {
-        if (quirks & HID_QUIRK_RDESC_BUTTON_CONSUMER)
-                usbhid_fixup_button_consumer_descriptor(rdesc, rsize);
-
         if (quirks & HID_QUIRK_RDESC_SAMSUNG_REMOTE)
                 usbhid_fixup_samsung_irda_descriptor(rdesc, rsize);
 }