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

Pull HID updates from Jiri Kosina:
 "Updates for HID code

   - improveements of Logitech HID++ procotol implementation, from
     Benjamin Tissoires

   - support for composite RMI devices, from Andrew Duggan

   - new driver for BETOP controller, from Huang Bo

   - fixup for conflicting mapping in HID core between PC-101/103/104
     and PC-102/105 keyboards from David Herrmann

   - new hardware support and fixes in Wacom driver, from Ping Cheng

   - assorted small fixes and device ID additions all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (33 commits)
  HID: wacom: add support for Cintiq 27QHD and 27QHD touch
  HID: wacom: consolidate input capability settings for pen and touch
  HID: wacom: make sure touch arbitration is applied consistently
  HID: pidff: Fix initialisation forMicrosoft Sidewinder FF Pro 2
  HID: hyperv: match wait_for_completion_timeout return type
  HID: wacom: Report ABS_MISC event for Cintiq Companion Hybrid
  HID: Use Kbuild idiom in Makefiles
  HID: do not bind to Microchip Pick16F1454
  HID: hid-lg4ff: use DEVICE_ATTR_RW macro
  HID: hid-lg4ff: fix sysfs attribute permission
  HID: wacom: peport In Range event according to the spec
  HID: wacom: process invalid Cintiq and Intuos data in wacom_intuos_inout()
  HID: rmi: Add support for the touchpad in the Razer Blade 14 laptop
  HID: rmi: Support touchpads with external buttons
  HID: rmi: Use hid_report_len to compute the size of reports
  HID: logitech-hidpp: store the name of the device in struct hidpp
  HID: microsoft: add support for Japanese Surface Type Cover 3
  HID: fixup the conflicting keyboard mappings quirk
  HID: apple: fix battery support for the 2009 ANSI wireless keyboard
  HID: fix Kconfig text
  ...

1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index bfad815cda8a..021ee1c1980a 100644
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -10,9 +10,10 @@
 #define WACOM_WAC_H
 
 #include <linux/types.h>
+#include <linux/hid.h>
 
 /* maximum packet length for USB devices */
-#define WACOM_PKGLEN_MAX        68
+#define WACOM_PKGLEN_MAX        192
 
 #define WACOM_NAME_MAX          64
 
@@ -36,6 +37,7 @@
 /* wacom data size per MT contact */
 #define WACOM_BYTES_PER_MT_PACKET       11
 #define WACOM_BYTES_PER_24HDT_PACKET    14
+#define WACOM_BYTES_PER_QHDTHID_PACKET   6
 
 /* device IDs */
 #define STYLUS_DEVICE_ID        0x02
@@ -57,6 +59,8 @@
 #define WACOM_REPORT_TPCMT              13
 #define WACOM_REPORT_TPCMT2             3
 #define WACOM_REPORT_TPCHID             15
+#define WACOM_REPORT_CINTIQ             16
+#define WACOM_REPORT_CINTIQPAD          17
 #define WACOM_REPORT_TPCST              16
 #define WACOM_REPORT_DTUS               17
 #define WACOM_REPORT_TPC1FGE            18
@@ -71,6 +75,14 @@
 #define WACOM_QUIRK_MONITOR             0x0008
 #define WACOM_QUIRK_BATTERY             0x0010
 
+#define WACOM_PEN_FIELD(f)      (((f)->logical == HID_DG_STYLUS) || \
+                                 ((f)->physical == HID_DG_STYLUS) || \
+                                 ((f)->physical == HID_DG_PEN) || \
+                                 ((f)->application == HID_DG_PEN))
+#define WACOM_FINGER_FIELD(f)   (((f)->logical == HID_DG_FINGER) || \
+                                 ((f)->physical == HID_DG_FINGER) || \
+                                 ((f)->application == HID_DG_TOUCHSCREEN))
+
 enum {
         PENPARTNER = 0,
         GRAPHIRE,
@@ -100,6 +112,7 @@ enum {
         WACOM_22HD,
         DTK,
         WACOM_24HD,
+        WACOM_27QHD,
         CINTIQ_HYBRID,
         CINTIQ,
         WACOM_BEE,
@@ -108,6 +121,7 @@ enum {
         WIRELESS,
         BAMBOO_PT,
         WACOM_24HDT,
+        WACOM_27QHDT,
         TABLETPC,   /* add new TPC below */
         TABLETPCE,
         TABLETPC2FG,
@@ -180,6 +194,7 @@ struct wacom_wac {
         int tool[2];
         int id[2];
         __u32 serial[2];
+        bool reporting_data;
         struct wacom_features features;
         struct wacom_shared *shared;
         struct input_dev *input;