Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID updates from Jiri Kosina:
 "Highlights:

   - conversion of HID subsystem to use devm-based resource management,
     from Benjamin Tissoires

   - i2c-hid support for DT bindings, from Benjamin Tissoires

   - much improved support for Win8-multitouch devices, from Benjamin
     Tissoires

   - cleanup of core code using common hidinput_input_event(), from
     David Herrmann

   - fix for bug in implement() access to the bit stream (causing oops)
     that has been present in the code for ages, but devices that are
     able to trigger it have started to appear only now, from Jiri
     Kosina

   - fixes for CVE-2013-2899, CVE-2013-2898, CVE-2013-2896,
     CVE-2013-2892, CVE-2013-2888 (all triggerable only by specially
     crafted malicious HW devices plugged into the system), from Kees
     Cook

   - hidraw oops fix, from Manoj Chourasia

   - various smaller fixes here and there, support for a bunch of new
     devices by various contributors"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (53 commits)
  HID: MAINTAINERS: add roccat drivers
  HID: hid-sensor-hub: change kmalloc + memcpy by kmemdup
  HID: hid-sensor-hub: move to devm_kzalloc
  HID: hid-sensor-hub: fix indentation accross the code
  HID: move HID_REPORT_TYPES closer to the report-definitions
  HID: check for NULL field when setting values
  HID: picolcd_core: validate output report details
  HID: sensor-hub: validate feature report details
  HID: ntrig: validate feature report details
  HID: pantherlord: validate output report details
  HID: hid-wiimote: print small buffers via %*phC
  HID: uhid: improve uhid example client
  HID: Correct the USB IDs for the new Macbook Air 6
  HID: wiimote: add support for Guitar-Hero guitars
  HID: wiimote: add support for Guitar-Hero drums
  Input: introduce BTN/ABS bits for drums and guitars
  HID: battery: don't do DMA from stack
  HID: roccat: add support for KonePureOptical v2
  HID: picolcd: Prevent NULL pointer dereference on _remove()
  HID: usbhid: quirk for N-Trig DuoSense Touch Screen
  ...

2 files changed, 26 insertions, 3 deletions

diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index d584047b072b..76457eef172a 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -716,6 +716,14 @@ struct input_keymap_entry {
 #define BTN_DPAD_LEFT           0x222
 #define BTN_DPAD_RIGHT          0x223
 
+#define BTN_FRET_FAR_UP         0x224
+#define BTN_FRET_UP             0x225
+#define BTN_FRET_MID            0x226
+#define BTN_FRET_LOW            0x227
+#define BTN_FRET_FAR_LOW        0x228
+#define BTN_STRUM_BAR_UP        0x229
+#define BTN_STRUM_BAR_DOWN      0x22a
+
 #define BTN_TRIGGER_HAPPY               0x2c0
 #define BTN_TRIGGER_HAPPY1              0x2c0
 #define BTN_TRIGGER_HAPPY2              0x2c1
@@ -829,8 +837,21 @@ struct input_keymap_entry {
 #define ABS_MT_TOOL_X           0x3c    /* Center X tool position */
 #define ABS_MT_TOOL_Y           0x3d    /* Center Y tool position */
 
-
-#define ABS_MAX                 0x3f
+/* Drums and guitars (mostly toys) */
+#define ABS_TOM_FAR_LEFT        0x40
+#define ABS_TOM_LEFT            0x41
+#define ABS_TOM_RIGHT           0x42
+#define ABS_TOM_FAR_RIGHT       0x43
+#define ABS_CYMBAL_FAR_LEFT     0x44
+#define ABS_CYMBAL_LEFT         0x45
+#define ABS_CYMBAL_RIGHT        0x46
+#define ABS_CYMBAL_FAR_RIGHT    0x47
+#define ABS_BASS                0x48
+#define ABS_HI_HAT              0x49
+#define ABS_FRET_BOARD          0x4a    /* Guitar fret board, vertical pos */
+#define ABS_WHAMMY_BAR          0x4b    /* Guitar whammy bar (or vibrato) */
+
+#define ABS_MAX                 0x4f
 #define ABS_CNT                 (ABS_MAX+1)
 
 /*
diff --git a/include/uapi/linux/uhid.h b/include/uapi/linux/uhid.h
index e9ed951e2b09..414b74be4da1 100644
--- a/include/uapi/linux/uhid.h
+++ b/include/uapi/linux/uhid.h
@@ -30,7 +30,7 @@ enum uhid_event_type {
         UHID_OPEN,
         UHID_CLOSE,
         UHID_OUTPUT,
-        UHID_OUTPUT_EV,
+        UHID_OUTPUT_EV,                 /* obsolete! */
         UHID_INPUT,
         UHID_FEATURE,
         UHID_FEATURE_ANSWER,
@@ -69,6 +69,8 @@ struct uhid_output_req {
         __u8 rtype;
 } __attribute__((__packed__));
 
+/* Obsolete! Newer kernels will no longer send these events but instead convert
+ * it into raw output reports via UHID_OUTPUT. */
 struct uhid_output_ev_req {
         __u16 type;
         __u16 code;