HID: uclogic: Add support for Huion Q620M

The Huion Q620M tablet needs a v2 frame dial.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index 3ac45e7572a0ce9198829e4ebf1888d366a8ac44..09c332c6a41210fb973fefd31c8dea95ad9b9ff9 100644 (file)
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -777,6 +777,23 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
                        p.frame_list[1].touch_ring_max = 12;
                        p.frame_list[1].touch_ring_flip_at = 6;
 
+                       /* Create v2 frame dial parameters */
+                       rc = uclogic_params_frame_init_with_desc(
+                                       &p.frame_list[2],
+                                       uclogic_rdesc_v2_frame_dial_arr,
+                                       uclogic_rdesc_v2_frame_dial_size,
+                                       UCLOGIC_RDESC_V2_FRAME_DIAL_ID);
+                       if (rc != 0) {
+                               hid_err(hdev,
+                                       "failed creating v2 frame dial parameters: %d\n",
+                                       rc);
+                               goto cleanup;
+                       }
+                       p.frame_list[2].suffix = "Dial";
+                       p.frame_list[2].dev_id_byte =
+                               UCLOGIC_RDESC_V2_FRAME_DIAL_DEV_ID_BYTE;
+                       p.frame_list[2].bitmap_dial_byte = 5;
+
                        /*
                         * Link button and touch ring subreports from pen
                         * reports
@@ -787,6 +804,9 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
                        p.pen.subreport_list[1].value = 0xf0;
                        p.pen.subreport_list[1].id =
                                UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_ID;
+                       p.pen.subreport_list[2].value = 0xf1;
+                       p.pen.subreport_list[2].id =
+                               UCLOGIC_RDESC_V2_FRAME_DIAL_ID;
                        goto output;
                }
                hid_dbg(hdev, "pen v2 parameters not found\n");

diff --git a/drivers/hid/hid-uclogic-rdesc.c b/drivers/hid/hid-uclogic-rdesc.c
index d64b607dce5d174d49f77e6cfb1ca22daaf55c50..dd792160fe7ef8e6331d504c667b94cb36b11b77 100644 (file)
--- a/drivers/hid/hid-uclogic-rdesc.c
+++ b/drivers/hid/hid-uclogic-rdesc.c
@@ -761,6 +761,56 @@ const __u8 uclogic_rdesc_v2_frame_touch_ring_arr[] = {
 const size_t uclogic_rdesc_v2_frame_touch_ring_size =
                        sizeof(uclogic_rdesc_v2_frame_touch_ring_arr);
 
+/* Fixed report descriptor for (tweaked) v2 frame dial reports */
+const __u8 uclogic_rdesc_v2_frame_dial_arr[] = {
+       0x05, 0x01,         /*  Usage Page (Desktop),               */
+       0x09, 0x07,         /*  Usage (Keypad),                     */
+       0xA1, 0x01,         /*  Collection (Application),           */
+       0x85, UCLOGIC_RDESC_V2_FRAME_DIAL_ID,
+                           /*      Report ID (DIAL_ID),            */
+       0x14,               /*      Logical Minimum (0),            */
+       0x05, 0x0D,         /*      Usage Page (Digitizer),         */
+       0x09, 0x39,         /*      Usage (Tablet Function Keys),   */
+       0xA0,               /*      Collection (Physical),          */
+       0x25, 0x01,         /*          Logical Maximum (1),        */
+       0x75, 0x01,         /*          Report Size (1),            */
+       0x95, 0x01,         /*          Report Count (1),           */
+       0x81, 0x01,         /*          Input (Constant),           */
+       0x05, 0x09,         /*          Usage Page (Button),        */
+       0x09, 0x01,         /*          Usage (01h),                */
+       0x95, 0x01,         /*          Report Count (1),           */
+       0x81, 0x02,         /*          Input (Variable),           */
+       0x95, 0x06,         /*          Report Count (6),           */
+       0x81, 0x01,         /*          Input (Constant),           */
+       0x75, 0x08,         /*          Report Size (8),            */
+       0x95, 0x02,         /*          Report Count (2),           */
+       0x81, 0x01,         /*          Input (Constant),           */
+       0x05, 0x0D,         /*          Usage Page (Digitizer),     */
+       0x0A, 0xFF, 0xFF,   /*          Usage (FFFFh),              */
+       0x26, 0xFF, 0x00,   /*          Logical Maximum (255),      */
+       0x95, 0x01,         /*          Report Count (1),           */
+       0x81, 0x02,         /*          Input (Variable),           */
+       0x05, 0x01,         /*          Usage Page (Desktop),       */
+       0x09, 0x38,         /*          Usage (Wheel),              */
+       0x95, 0x01,         /*          Report Count (1),           */
+       0x15, 0xFF,         /*          Logical Minimum (-1),       */
+       0x25, 0x01,         /*          Logical Maximum (1),        */
+       0x81, 0x06,         /*          Input (Variable, Relative), */
+       0x09, 0x30,         /*          Usage (X),                  */
+       0x09, 0x31,         /*          Usage (Y),                  */
+       0x14,               /*          Logical Minimum (0),        */
+       0x25, 0x01,         /*          Logical Maximum (1),        */
+       0x75, 0x01,         /*          Report Size (1),            */
+       0x95, 0x02,         /*          Report Count (2),           */
+       0x81, 0x02,         /*          Input (Variable),           */
+       0x95, 0x2E,         /*          Report Count (46),          */
+       0x81, 0x01,         /*          Input (Constant),           */
+       0xC0,               /*      End Collection,                 */
+       0xC0                /*  End Collection                      */
+};
+const size_t uclogic_rdesc_v2_frame_dial_size =
+                       sizeof(uclogic_rdesc_v2_frame_dial_arr);
+
 /* Fixed report descriptor for Ugee EX07 frame */
 const __u8 uclogic_rdesc_ugee_ex07_frame_arr[] = {
        0x05, 0x01,             /*  Usage Page (Desktop),                   */

diff --git a/drivers/hid/hid-uclogic-rdesc.h b/drivers/hid/hid-uclogic-rdesc.h
index f15a9d8a946b361b60b0e5dc053719da789dd76f..2ab6b7d5f5af4bcba638cf6bb88b8914892f5117 100644 (file)
--- a/drivers/hid/hid-uclogic-rdesc.h
+++ b/drivers/hid/hid-uclogic-rdesc.h
@@ -141,6 +141,16 @@ extern const size_t uclogic_rdesc_v2_frame_touch_ring_size;
 /* Device ID byte offset in v2 frame touch ring reports */
 #define UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_DEV_ID_BYTE  0x4
 
+/* Report ID for tweaked v2 frame dial reports */
+#define UCLOGIC_RDESC_V2_FRAME_DIAL_ID 0xf9
+
+/* Fixed report descriptor for (tweaked) v2 frame dial reports */
+extern const __u8 uclogic_rdesc_v2_frame_dial_arr[];
+extern const size_t uclogic_rdesc_v2_frame_dial_size;
+
+/* Device ID byte offset in v2 frame dial reports */
+#define UCLOGIC_RDESC_V2_FRAME_DIAL_DEV_ID_BYTE        0x4
+
 /* Fixed report descriptor for Ugee EX07 frame */
 extern const __u8 uclogic_rdesc_ugee_ex07_frame_arr[];
 extern const size_t uclogic_rdesc_ugee_ex07_frame_size;