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

Pull HID updates from Jiri Kosina:
 - HID battery handling cleanup by David Herrmann
 - ELO 4000/4500 driver, which has been finally ported to be proper HID
   driver by Jiri Slaby
 - ps3remote driver functionality is now provided by generic sony
   driver, by Jiri Kosina
 - PS2/3 Buzz controllers support, by Colin Leitner
 - rework of wiimote driver including full extensions hotpluggin
   support, sub-device modularization and speaker support by David
   Herrmann

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits)
  HID: wacom: Intuos4 battery charging changes
  HID: i2c-hid: support sending HID output reports using the output register
  HID: kye: Add report fixup for Genius Gila Gaming mouse
  HID: wiimote: support Nintendo Wii U Pro Controller
  Input: make gamepad API keycodes more clear
  input: document gamepad API and add extra keycodes
  HID: explain out-of-range check better
  HID: fix false positive out of range values
  HID: wiimote: fix coccinelle warnings
  HID: roccat: check cdev_add return value
  HID: fold ps3remote driver into generic Sony driver
  HID: hyperv: convert alloc+memcpy to memdup
  HID: core: fix reporting of raw events
  HID: wiimote: discard invalid EXT data reports
  HID: wiimote: fix classic controller parsing
  HID: wiimote: init EXT/MP during device detection
  HID: wiimote: fix DRM debug-attr to correctly parse input
  HID: wiimote: add MP quirks
  HID: wiimote: remove old static extension support
  HID: wiimote: add "bboard_calib" attribute
  ...

25 files changed, 4640 insertions, 1728 deletions

diff --git a/Documentation/ABI/testing/sysfs-driver-hid-wiimote b/Documentation/ABI/testing/sysfs-driver-hid-wiimote
index 3d98009f447a..ed5dd567d397 100644
--- a/Documentation/ABI/testing/sysfs-driver-hid-wiimote
+++ b/Documentation/ABI/testing/sysfs-driver-hid-wiimote
@@ -12,7 +12,7 @@ Description:	Make it possible to set/get current led state. Reading from it
 What:           /sys/bus/hid/drivers/wiimote/<dev>/extension
 Date:           August 2011
 KernelVersion:  3.2
-Contact:        David Herrmann <dh.herrmann@googlemail.com>
+Contact:        David Herrmann <dh.herrmann@gmail.com>
 Description:    This file contains the currently connected and initialized
                 extensions. It can be one of: none, motionp, nunchuck, classic,
                 motionp+nunchuck, motionp+classic
@@ -20,3 +20,40 @@ Description:	This file contains the currently connected and initialized
                 the official Nintendo Nunchuck extension and classic is the
                 Nintendo Classic Controller extension. The motionp extension can
                 be combined with the other two.
+                Starting with kernel-version 3.11 Motion Plus hotplugging is
+                supported and if detected, it's no longer reported as static
+                extension. You will get uevent notifications for the motion-plus
+                device then.
+
+What:           /sys/bus/hid/drivers/wiimote/<dev>/devtype
+Date:           May 2013
+KernelVersion:  3.11
+Contact:        David Herrmann <dh.herrmann@gmail.com>
+Description:    While a device is initialized by the wiimote driver, we perform
+                a device detection and signal a "change" uevent after it is
+                done. This file shows the detected device type. "pending" means
+                that the detection is still ongoing, "unknown" means, that the
+                device couldn't be detected or loaded. "generic" means, that the
+                device couldn't be detected but supports basic Wii Remote
+                features and can be used.
+                Other strings for each device-type are available and may be
+                added if new device-specific detections are added.
+                Currently supported are:
+                        gen10: First Wii Remote generation
+                        gen20: Second Wii Remote Plus generation (builtin MP)
+                        balanceboard: Wii Balance Board
+
+What:           /sys/bus/hid/drivers/wiimote/<dev>/bboard_calib
+Date:           May 2013
+KernelVersion:  3.11
+Contact:        David Herrmann <dh.herrmann@gmail.com>
+Description:    This attribute is only provided if the device was detected as a
+                balance board. It provides a single line with 3 calibration
+                values for all 4 sensors. The values are separated by colons and
+                are each 2 bytes long (encoded as 4 digit hexadecimal value).
+                First, 0kg values for all 4 sensors are written, followed by the
+                17kg values for all 4 sensors and last the 34kg values for all 4
+                sensors.
+                Calibration data is already applied by the kernel to all input
+                values but may be used by user-space to perform other
+                transformations.
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index fb52f3f6de80..14ef6ab69790 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -217,6 +217,13 @@ config HID_ELECOM
         ---help---
         Support for the ELECOM BM084 (bluetooth mouse).
 
+config HID_ELO
+        tristate "ELO USB 4000/4500 touchscreen"
+        depends on USB_HID
+        ---help---
+        Support for the ELO USB 4000/4500 touchscreens. Note that this is for
+        different devices than those handled by CONFIG_TOUCHSCREEN_USB_ELO.
+
 config HID_EZKEY
         tristate "Ezkey BTC 8193 keyboard" if EXPERT
         depends on HID
@@ -231,6 +238,9 @@ config HID_HOLTEK
         Support for Holtek based devices:
           - Holtek On Line Grip based game controller
           - Trust GXT 18 Gaming Keyboard
+          - Sharkoon Drakonia / Perixx MX-2000 gaming mice
+          - Tracer Sniper TRM-503 / NOVA Gaming Slider X200 /
+            Zalman ZM-GM1
 
 config HOLTEK_FF
         bool "Holtek On Line Grip force feedback support"
@@ -240,6 +250,12 @@ config HOLTEK_FF
           Say Y here if you have a Holtek On Line Grip based game controller
           and want to have force feedback support for it.
 
+config HID_HUION
+        tristate "Huion tablets"
+        depends on USB_HID
+        ---help---
+        Support for Huion 580 tablet.
+
 config HID_KEYTOUCH
         tristate "Keytouch HID devices"
         depends on HID
@@ -561,15 +577,6 @@ config HID_PRIMAX
         Support for Primax devices that are not fully compliant with the
         HID standard.
 
-config HID_PS3REMOTE
-        tristate "Sony PS3 BD Remote Control"
-        depends on HID
-        ---help---
-        Support for the Sony PS3 Blue-ray Disk Remote Control and Logitech
-        Harmony Adapter for PS3, which connect over Bluetooth.
-
-        Support for the 6-axis controllers is provided by HID_SONY.
-
 config HID_ROCCAT
         tristate "Roccat device support"
         depends on USB_HID
@@ -594,12 +601,17 @@ config HID_SAMSUNG
         Support for Samsung InfraRed remote control or keyboards.
 
 config HID_SONY
-        tristate "Sony PS3 controller"
+        tristate "Sony PS2/3 accessories"
         depends on USB_HID
+        depends on NEW_LEDS
+        depends on LEDS_CLASS
         ---help---
-        Support for Sony PS3 6-axis controllers.
+        Support for
 
-        Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE.
+          * Sony PS3 6-axis controllers
+          * Buzz controllers
+          * Sony PS3 Blue-ray Disk Remote Control (Bluetooth)
+          * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth)
 
 config HID_SPEEDLINK