From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Date: Wed, 22 Feb 2023 09:41:39 +0000 (+0100)
Subject: Merge branch 'for-6.3/uclogic' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a738688177dcdffe8064dc5ecac6ec4431b6b951;p=linux.git

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

UClogic assorted fixes and new devices support (José Expósito)
---

a738688177dcdffe8064dc5ecac6ec4431b6b951
diff --cc drivers/hid/hid-ids.h
index 61e2b463e876b,5df7f4e4d6106..63545cd307e5f
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -1302,9 -1295,10 +1302,11 @@@
  #define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540	0x0075
  #define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640	0x0094
  #define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01	0x0042
 +#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01_V2	0x0905
  #define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L	0x0935
+ #define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_MW	0x0934
  #define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S	0x0909
+ #define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW	0x0933
  #define USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06	0x0078
  #define USB_DEVICE_ID_UGEE_TABLET_G5		0x0074
  #define USB_DEVICE_ID_UGEE_TABLET_EX07S		0x0071
diff --cc drivers/hid/hid-uclogic-core.c
index cfbbc39807a69,a31e06b38a67f..f67835f9ed4cc
--- a/drivers/hid/hid-uclogic-core.c
+++ b/drivers/hid/hid-uclogic-core.c
@@@ -525,12 -538,16 +538,18 @@@ static const struct hid_device_id uclog
  				USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
  				USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01) },
 +	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
 +				USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01_V2) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
  				USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
+ 				USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_MW),
+ 		.driver_data = UCLOGIC_MOUSE_FRAME_QUIRK | UCLOGIC_BATTERY_QUIRK },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
  				USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
+ 				USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW),
+ 		.driver_data = UCLOGIC_MOUSE_FRAME_QUIRK | UCLOGIC_BATTERY_QUIRK },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
  				USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06) },
  	{ }
diff --cc drivers/hid/hid-uclogic-params.c
index 3c5eea3df3288,7fdb87a2714bb..9859dad36495a
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@@ -1655,12 -1763,14 +1763,16 @@@ int uclogic_params_init(struct uclogic_
  		break;
  	case VID_PID(USB_VENDOR_ID_UGEE,
  		     USB_DEVICE_ID_UGEE_PARBLO_A610_PRO):
 +	case VID_PID(USB_VENDOR_ID_UGEE,
 +		     USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01_V2):
  	case VID_PID(USB_VENDOR_ID_UGEE,
  		     USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L):
+ 	case VID_PID(USB_VENDOR_ID_UGEE,
+ 		     USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_MW):
  	case VID_PID(USB_VENDOR_ID_UGEE,
  		     USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S):
+ 	case VID_PID(USB_VENDOR_ID_UGEE,
+ 		     USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW):
  		rc = uclogic_params_ugee_v2_init(&p, hdev);
  		if (rc != 0)
  			goto cleanup;