Commit e518f368 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

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
parents 2fe90223 06483d25

drivers/hid/hid-uclogic-rdesc.c

+5 −4
Original line number Diff line number Diff line
@@ -690,10 +690,10 @@ const size_t uclogic_rdesc_v2_pen_template_size = 
	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 +790,8 @@ const __u8 uclogic_rdesc_v2_frame_touch_strip_arr[] = { 
	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),        */