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

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

diff --cc drivers/hid/hid-ids.h
index 61e2b463e876bca641657d118260e80b162010a7,5df7f4e4d61064b7708350fcb95fd807d1f064a6..63545cd307e5f8805672301dac5adbfa0025f5f2
--- 1/drivers/hid/hid-ids.h
--- 2/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-input.c
Simple merge

diff --cc drivers/hid/hid-uclogic-core.c
index cfbbc39807a69f80bfe100ba04c96c297418220a,a31e06b38a67f7e4cbe2e2f8054a052c21fb46a2..f67835f9ed4ccae359271e401a3e40f2fd282b00
--- 1/drivers/hid/hid-uclogic-core.c
--- 2/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 3c5eea3df3288bed9a51b3bb4daa9c803313d9a5,7fdb87a2714bb2c14fbe30ac4ea374f392f5c2cc..9859dad36495ad09fc2472c94e444231ed2b0974
--- 1/drivers/hid/hid-uclogic-params.c
--- 2/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;