Merge branch 'for-6.1/wacom' into for-linus

[linux-block.git] / drivers / hid / wacom_wac.c

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 1bbd24ebacad4f8c89cb48aebea46eba1d0e1036..77486962a773f5a197d151d62ed5e387f1890570 100644 (file)
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -708,11 +708,14 @@ static int wacom_intuos_get_tool_type(int tool_id)
        case 0x802: /* Intuos4/5 13HD/24HD General Pen */
        case 0x8e2: /* IntuosHT2 pen */
        case 0x022:
+       case 0x200: /* Pro Pen 3 */
+       case 0x04200: /* Pro Pen 3 */
        case 0x10842: /* MobileStudio Pro Pro Pen slim */
        case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */
        case 0x16802: /* Cintiq 13HD Pro Pen */
        case 0x18802: /* DTH2242 Pen */
        case 0x10802: /* Intuos4/5 13HD/24HD General Pen */
+       case 0x80842: /* Intuos Pro and Cintiq Pro 3D Pen */
                tool_type = BTN_TOOL_PEN;
                break;
 
@@ -4870,6 +4873,10 @@ static const struct wacom_features wacom_features_0x3c6 =
 static const struct wacom_features wacom_features_0x3c8 =
        { "Wacom Intuos BT M", 21600, 13500, 4095, 63,
          INTUOSHT3_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4 };
+static const struct wacom_features wacom_features_0x3dd =
+       { "Wacom Intuos Pro S", 31920, 19950, 8191, 63,
+         INTUOSP2S_BT, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 7,
+         .touch_max = 10 };
 
 static const struct wacom_features wacom_features_HID_ANY_ID =
        { "Wacom HID", .type = HID_GENERIC, .oVid = HID_ANY_ID, .oPid = HID_ANY_ID };
@@ -5045,6 +5052,7 @@ const struct hid_device_id wacom_ids[] = {
        { BT_DEVICE_WACOM(0x393) },
        { BT_DEVICE_WACOM(0x3c6) },
        { BT_DEVICE_WACOM(0x3c8) },
+       { BT_DEVICE_WACOM(0x3dd) },
        { USB_DEVICE_WACOM(0x4001) },
        { USB_DEVICE_WACOM(0x4004) },
        { USB_DEVICE_WACOM(0x5000) },