Merge branch 'for-5.3/uclogic' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)
1  2 
drivers/hid/hid-ids.h
drivers/hid/hid-uclogic-core.c
drivers/hid/hid-uclogic-params.c

diff --combined drivers/hid/hid-ids.h
index bfc584ada4ebf1a45ab58a1a27024ec367d317f9,3ab3f5d221a88327de810e1f82b53f39bd721290..0d695f8e1b2c4cb5771e6fdf28d75af076d886fa
@@@ -1,4 -1,3 +1,4 @@@
 +/* SPDX-License-Identifier: GPL-2.0-or-later */
  /*
   *  USB HID quirks support for Linux
   *
@@@ -9,6 -8,10 +9,6 @@@
   */
  
  /*
 - * This program is free software; you can redistribute it and/or modify it
 - * under the terms of the GNU General Public License as published by the Free
 - * Software Foundation; either version 2 of the License, or (at your option)
 - * any later version.
   */
  
  #ifndef HID_IDS_H_FILE
@@@ -80,7 -83,6 +80,7 @@@
  #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP   0x1220
  #define HID_DEVICE_ID_ALPS_U1         0x1215
  #define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C
 +#define HID_DEVICE_ID_ALPS_1222               0x1222
  
  
  #define USB_VENDOR_ID_AMI             0x046b
  #define USB_DEVICE_ID_CHICONY_MULTI_TOUCH     0xb19d
  #define USB_DEVICE_ID_CHICONY_WIRELESS        0x0618
  #define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE        0x1053
 +#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2       0x0939
  #define USB_DEVICE_ID_CHICONY_WIRELESS2       0x1123
  #define USB_DEVICE_ID_ASUS_AK1D               0x1125
  #define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A   0x1408
  
  #define USB_VENDOR_ID_HUION           0x256c
  #define USB_DEVICE_ID_HUION_TABLET    0x006e
 +#define USB_DEVICE_ID_HUION_HS64      0x006d
  
  #define USB_VENDOR_ID_IBM                                     0x04b3
  #define USB_DEVICE_ID_IBM_SCROLLPOINT_III                     0x3100
  #define USB_DEVICE_ID_SYNAPTICS_HD    0x0ac3
  #define USB_DEVICE_ID_SYNAPTICS_QUAD_HD       0x1ac3
  #define USB_DEVICE_ID_SYNAPTICS_TP_V103       0x5710
 +#define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5  0x81a7
  
  #define USB_VENDOR_ID_TEXAS_INSTRUMENTS       0x2047
  #define USB_DEVICE_ID_TEXAS_INSTRUMENTS_LENOVO_YOGA   0x0855
  #define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01        0x0042
  #define USB_DEVICE_ID_UGEE_TABLET_G5          0x0074
  #define USB_DEVICE_ID_UGEE_TABLET_EX07S               0x0071
+ #define USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720       0x0055
  
  #define USB_VENDOR_ID_UNITEC  0x227d
  #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709   0x0709
  #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
  #define USB_DEVICE_ID_PRIMAX_REZEL    0x4e72
  #define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D0F        0x4d0f
 +#define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D65        0x4d65
  #define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4E22        0x4e22
  
  
index 914fb527ae7a78e57fdad2dee7e6d50641c2f6cf,490c1ddb350c61fba1d6c0d27e7ece3447fd6531..86b568037cb8af6ed004c4067f4d4314d3ed04b1
@@@ -369,8 -369,6 +369,8 @@@ static const struct hid_device_id uclog
                                USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HUION,
                                USB_DEVICE_ID_HUION_TABLET) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_HUION,
 +                              USB_DEVICE_ID_HUION_HS64) },
        { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,
                                USB_DEVICE_ID_HUION_TABLET) },
        { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,
                                USB_DEVICE_ID_UGEE_TABLET_G5) },
        { HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
                                USB_DEVICE_ID_UGEE_TABLET_EX07S) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
+                               USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720) },
        { HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
                                USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540) },
        { HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
index 273d784fff66df68bb7ab8166599ca343e939813,8e120dde31fa8b0e4ace27ff0b96d30e6e9b2e4f..78a364ae2f68580913c2e0e589cc9156ca4b8140
@@@ -977,8 -977,6 +977,8 @@@ int uclogic_params_init(struct uclogic_
                /* FALL THROUGH */
        case VID_PID(USB_VENDOR_ID_HUION,
                     USB_DEVICE_ID_HUION_TABLET):
 +      case VID_PID(USB_VENDOR_ID_HUION,
 +                   USB_DEVICE_ID_HUION_HS64):
        case VID_PID(USB_VENDOR_ID_UCLOGIC,
                     USB_DEVICE_ID_HUION_TABLET):
        case VID_PID(USB_VENDOR_ID_UCLOGIC,
                     USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540):
        case VID_PID(USB_VENDOR_ID_UGEE,
                     USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640):
+       case VID_PID(USB_VENDOR_ID_UGEE,
+                    USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720):
                /* If this is the pen interface */
                if (bInterfaceNumber == 1) {
                        /* Probe v1 pen parameters */