Merge branch 'for-6.11/uclogic' into for-linus

Couple of hid-uclogic fixes by José Expósito:
- Support HUION devices with up to 20 buttons
- Use Rx and Ry for touch strips

diff --combined drivers/hid/hid-uclogic-rdesc.c
index 6c7a904175695b85d4096bfb5cadc6a6cc2f14a3,dfd74a043b392b7e5d8dfd3b5c3bc1c64c56ab04..acfa591ab52f17ec7ae76bffc785104628133e27
--- 1/drivers/hid/hid-uclogic-rdesc.c
--- 2/drivers/hid/hid-uclogic-rdesc.c
+++ b/drivers/hid/hid-uclogic-rdesc.c
@@@ -17,7 -17,6 +17,7 @@@
  #include "hid-uclogic-rdesc.h"
  #include <linux/slab.h>
  #include <asm/unaligned.h>
 +#include <kunit/visibility.h>
  
  /* Fixed WP4030U report descriptor */
  __u8 uclogic_rdesc_wp4030u_fixed_arr[] = {
@@@ -690,10 -689,10 +690,10 @@@ const size_t uclogic_rdesc_v2_pen_templ
        0xA0,           /*      Collection (Physical),          */ \
        0x05, 0x09,     /*          Usage Page (Button),        */ \
        0x19, 0x01,     /*          Usage Minimum (01h),        */ \
-       0x29, 0x03,     /*          Usage Maximum (03h),        */ \
-       0x95, 0x03,     /*          Report Count (3),           */ \
+       0x29, 0x0A,     /*          Usage Maximum (0Ah),        */ \
+       0x95, 0x0A,     /*          Report Count (10),          */ \
        0x81, 0x02,     /*          Input (Variable),           */ \
-       0x95, ((_size) * 8 - 45),                                  \
+       0x95, ((_size) * 8 - 52),                                  \
                        /*          Report Count (padding),     */ \
        0x81, 0x01,     /*          Input (Constant),           */ \
        0xC0,           /*      End Collection,                 */ \
@@@ -790,7 -789,8 +790,8 @@@ const __u8 uclogic_rdesc_v2_frame_touch
        0x95, 0x01,         /*          Report Count (1),           */
        0x81, 0x02,         /*          Input (Variable),           */
        0x05, 0x01,         /*          Usage Page (Desktop),       */
-       0x09, 0x38,         /*          Usage (Wheel),              */
+       0x09, 0x33,         /*          Usage (Rx),                 */
+       0x09, 0x34,         /*          Usage (Ry),                 */
        0x95, 0x01,         /*          Report Count (1),           */
        0x15, 0x00,         /*          Logical Minimum (0),        */
        0x25, 0x07,         /*          Logical Maximum (7),        */
@@@ -1243,4 -1243,3 +1244,4 @@@ __u8 *uclogic_rdesc_template_apply(cons
  
        return rdesc_ptr;
  }
 +EXPORT_SYMBOL_IF_KUNIT(uclogic_rdesc_template_apply);