Merge branches 'for-4.13/multitouch', 'for-4.13/retrode', 'for-4.13/transport-open...

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
Simple merge

diff --cc drivers/hid/hid-core.c
index 09f12236e23f261e2d32040fe4d4807d878f48e6,6e040692f1d8f2c7032c51ad96540a341f80c35b,49b9b4e8bfb4b42c580e67cd16759a3c145670b7,f93dd6f48a79f9d8238e16e271f8eb898b092cee,8017de4e5c1155146fb66ef22f6df5497415eafd,37084b6457851ebe0d52361e327db9df07b86b2c..539d1dd888deda938f59dc76a26e8e2ad988e323
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/drivers/hid/hid-core.c
--- 5/drivers/hid/hid-core.c
--- 6/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@@ -1891,83 -1891,82 -1891,82 -1943,55 -1855,52 -1855,52 +1979,83 @@@@@@@ static const struct hid_device_id hid_h
        { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2) },
    ++  { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },
 +++++  { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },
 +++++  { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_AUREAL)
        { HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_BELKIN)
        { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_BETOP_FF)
        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185BFM, 0x2208) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185PC, 0x5506) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185V2PC, 0x1850) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185V2BFM, 0x5500) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_CHERRY)
        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_CHICONY)
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
 -----  { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },
 +++++  { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_ASUS_AK1D) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_ACER_SWITCH12) },
 --     { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_JESS_ZEN_AIO_KBD) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_CMEDIA)
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_CORSAIR)
        { HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K90) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_SCIMITAR_PRO_RGB) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_CP2112)
        { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_CP2112) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_CYPRESS)
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_4) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_DELCOM, USB_DEVICE_ID_DELCOM_VISUAL_IND) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_DRAGONRISE)
        { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },
   ---#if IS_ENABLED(CONFIG_HID_MAYFLASH)
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE2) },
      #endif
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_WN) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA) },
   +++#if IS_ENABLED(CONFIG_HID_ELECOM)
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
    ++  { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_DEFT_WIRED) },
    ++  { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_DEFT_WIRELESS) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_ELO)
        { HID_USB_DEVICE(USB_VENDOR_ID_ELO, 0x0009) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ELO, 0x0030) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_ACCUTOUCH_2216) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_EMS_FF)
        { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_EZKEY)
        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_GEMBIRD)
        { HID_USB_DEVICE(USB_VENDOR_ID_GEMBIRD, USB_DEVICE_ID_GEMBIRD_JPD_DUALFORCE2) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_GFRM)
   +++        { HID_BLUETOOTH_DEVICE(0x58, 0x2000) },
   +++        { HID_BLUETOOTH_DEVICE(0x471, 0x2210) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_GREENASIA)
        { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_GT683R)
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_GYRATION)
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
@@@@@@@ -1981,20 -1980,17 -1980,17 -2003,12 -1912,12 -1912,12 +2069,20 @@@@@@@
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A0C2) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_JESS_ZEN_AIO_KBD) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_ICADE)
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },
   +++#endif
 +++++#if IS_ENABLED(CONFIG_HID_ITE)
 +++++  { HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) },
 +++++#endif
   +++#if IS_ENABLED(CONFIG_HID_KENSINGTON)
        { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_KEYTOUCH)
        { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_KYE)
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_MANTICORE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GX_IMPERATOR) },
@@@@@@@ -2124,41 -2120,41 -2120,44 -2105,13 -2014,13 -2014,13 +2212,44 @@@@@@@
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_ORTEK)
        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_PANTHERLORD)
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_PENMOUNT)
        { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_6000) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_PETALYNX)
        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_PICOLCD)
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_PLANTRONICS)
        { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_PRIMAX)
        { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) },
   ---  { HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) },
   +++#endif
   +++#if IS_ENABLED(CONFIG_HID_PRODIKEYS)
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
   +++#endif
++ +++#if IS_ENABLED(CONFIG_HID_RETRODE)
++ +++  { HID_USB_DEVICE(USB_VENDOR_ID_FUTURE_TECHNOLOGY, USB_DEVICE_ID_RETRODE2) },
++ +++#endif
   +++#if IS_ENABLED(CONFIG_HID_RMI)
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) },
   +++  { HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) },
   +++#endif
      #if IS_ENABLED(CONFIG_HID_ROCCAT)
        { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ARVO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) },

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/i2c-hid/i2c-hid.c
Simple merge

diff --cc drivers/hid/wacom_wac.c
index e274c9dc32f3a211d97d02f2b6477f20c9121fac,e274c9dc32f3a211d97d02f2b6477f20c9121fac,e274c9dc32f3a211d97d02f2b6477f20c9121fac,e274c9dc32f3a211d97d02f2b6477f20c9121fac,4b225fb19a16842f635026d1b1023d5d1cf5068e,149bdff28d3269d9dcdc11c1a88d34861a1f676c..9f940293ede4109b3628e2aa72b1f872d0cc6072
--- 1/drivers/hid/wacom_wac.c
--- 2/drivers/hid/wacom_wac.c
--- 3/drivers/hid/wacom_wac.c
--- 4/drivers/hid/wacom_wac.c
--- 5/drivers/hid/wacom_wac.c
--- 6/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@@@@@@ -1583,26 -1583,26 -1583,26 -1583,26 -1578,30 -1585,30 +1590,26 @@@@@@@ static int wacom_tpc_irq(struct wacom_w
                dev_dbg(wacom->touch_input->dev.parent,
                        "%s: received report #%d\n", __func__, data[0]);
      
    --  switch (len) {
    --  case WACOM_PKGLEN_TPC1FG:
    --          return wacom_tpc_single_touch(wacom, len);
    - 
    -   case WACOM_PKGLEN_TPC2FG:
    -           return wacom_tpc_mt_touch(wacom);
    ++          switch (len) {
    ++          case WACOM_PKGLEN_TPC1FG:
    ++                  return wacom_tpc_single_touch(wacom, len);
      
    -   case WACOM_PKGLEN_PENABLED:
    -           return wacom_tpc_pen(wacom);
     -  case WACOM_PKGLEN_TPC2FG:
     -          return wacom_tpc_mt_touch(wacom);
    ++          case WACOM_PKGLEN_TPC2FG:
    ++                  return wacom_tpc_mt_touch(wacom);
      
    -   default:
    -           switch (data[0]) {
    -           case WACOM_REPORT_TPC1FG:
    -           case WACOM_REPORT_TPCHID:
    -           case WACOM_REPORT_TPCST:
    -           case WACOM_REPORT_TPC1FGE:
    -                   return wacom_tpc_single_touch(wacom, len);
     -  case WACOM_PKGLEN_PENABLED:
     -          return wacom_tpc_pen(wacom);
    ++          default:
    ++                  switch (data[0]) {
    ++                  case WACOM_REPORT_TPC1FG:
    ++                  case WACOM_REPORT_TPCHID:
    ++                  case WACOM_REPORT_TPCST:
    ++                  case WACOM_REPORT_TPC1FGE:
    ++                          return wacom_tpc_single_touch(wacom, len);
      
     -  default:
     -          switch (data[0]) {
     -          case WACOM_REPORT_TPC1FG:
     -          case WACOM_REPORT_TPCHID:
     -          case WACOM_REPORT_TPCST:
     -          case WACOM_REPORT_TPC1FGE:
     -                  return wacom_tpc_single_touch(wacom, len);
     -
    --          case WACOM_REPORT_TPCMT:
    --          case WACOM_REPORT_TPCMT2:
    --                  return wacom_mt_touch(wacom);
    ++                  case WACOM_REPORT_TPCMT:
    ++                  case WACOM_REPORT_TPCMT2:
    ++                          return wacom_mt_touch(wacom);
      
    --          case WACOM_REPORT_PENABLED:
    --                  return wacom_tpc_pen(wacom);
    ++                  }
                }
        }
      

diff --cc include/linux/hid.h
Simple merge