diff mbox

HID: add two missing usages for digitizer

Message ID e974c5f4-1c4a-4c24-2874-af6cc40514a2@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Xiaolei Yu March 25, 2017, 6:04 a.m. UTC 
They are part of HUTRR34 for multi-touch digitizers:

0x0E    Device configuration    CA      16.7
0x23    Device settings         CL      16.7

Signed-off-by: Xiaolei Yu <dreifachstein@gmail.com>
---
 drivers/hid/hid-debug.c | 2 ++
 include/linux/hid.h     | 2 ++
 2 files changed, 4 insertions(+)

Comments

Jiri Kosina March 30, 2017, 9:07 a.m. UTC | #1 
On Sat, 25 Mar 2017, Xiaolei Yu wrote:

> They are part of HUTRR34 for multi-touch digitizers:
> 
> 0x0E    Device configuration    CA      16.7
> 0x23    Device settings         CL      16.7
> 
> Signed-off-by: Xiaolei Yu <dreifachstein@gmail.com>

Applied to for-4.12/upstream. Thanks,
diff mbox

Patch

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index c6c9c51c806f..5271db593478 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -140,9 +140,11 @@  static const struct hid_usage_entry hid_usage_table[] = {
     {0, 0x03, "LightPen"},
     {0, 0x04, "TouchScreen"},
     {0, 0x05, "TouchPad"},
+    {0, 0x0e, "DeviceConfiguration"},
     {0, 0x20, "Stylus"},
     {0, 0x21, "Puck"},
     {0, 0x22, "Finger"},
+    {0, 0x23, "DeviceSettings"},
     {0, 0x30, "TipPressure"},
     {0, 0x31, "BarrelPressure"},
     {0, 0x32, "InRange"},
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 28f38e2b8f30..536f11fd21d5 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -268,6 +268,8 @@  struct hid_item {
 #define HID_CP_APPLICATIONLAUNCHBUTTONS	0x000c0180
 #define HID_CP_GENERICGUIAPPLICATIONCONTROLS	0x000c0200
 
+#define HID_DG_DEVICECONFIG	0x000d000e
+#define HID_DG_DEVICESETTINGS	0x000d0023
 #define HID_DG_CONFIDENCE	0x000d0047
 #define HID_DG_WIDTH		0x000d0048
 #define HID_DG_HEIGHT		0x000d0049