Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion', 'for-3.17...

diff --combined drivers/hid/Kconfig
index 08c9693e6f8339ca886617f435ee0e3bfc7caa5d,800c8b60f7a2c6d01024060cb30493a583984f7d,5e79c6ad914f301aa676a763412727987c8610a4,5e79c6ad914f301aa676a763412727987c8610a4,5e79c6ad914f301aa676a763412727987c8610a4,21cce19d301eaaf6f36e007176a0e17b874b8f7d,5e79c6ad914f301aa676a763412727987c8610a4,800c8b60f7a2c6d01024060cb30493a583984f7d..e02cf59b048d306c8aa21633537bcbd2c8dffcfc
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
--- 3/drivers/hid/Kconfig
--- 4/drivers/hid/Kconfig
--- 5/drivers/hid/Kconfig
--- 6/drivers/hid/Kconfig
--- 7/drivers/hid/Kconfig
--- 8/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@@@@@@ -331,18 -331,18 -331,18 -331,18 -331,18 -331,20 -331,18 -331,18 +331,20 @@@@@@@@@ config HID_LCPOWE
                ---help---
                Support for LC-Power RC1000MCE RF remote control.
        
----- --config HID_LENOVO_TPKBD
----- --        tristate "Lenovo ThinkPad USB Keyboard with TrackPoint"
+++++ ++config HID_LENOVO
+++++ ++        tristate "Lenovo / Thinkpad devices"
                depends on HID
                select NEW_LEDS
                select LEDS_CLASS
                ---help---
----- --        Support for the Lenovo ThinkPad USB Keyboard with TrackPoint.
+++++ ++        Support for Lenovo devices that are not fully compliant with HID standard.
        
----- --        Say Y here if you have a Lenovo ThinkPad USB Keyboard with TrackPoint
----- --        and would like to use device-specific features like changing the
----- --        sensitivity of the trackpoint, using the microphone mute button or
----- --        controlling the mute and microphone mute LEDs.
+++++ ++        Say Y if you want support for the non-compliant features of the Lenovo
+++++ ++        Thinkpad standalone keyboards, e.g:
+++++ ++        - ThinkPad USB Keyboard with TrackPoint (supports extra LEDs and trackpoint
+++++ ++          configuration)
+++++ ++        - ThinkPad Compact Bluetooth Keyboard with TrackPoint (supports Fn keys)
+++++ ++        - ThinkPad Compact USB Keyboard with TrackPoint (supports Fn keys)
        
        config HID_LOGITECH
                tristate "Logitech devices" if EXPERT
@@@@@@@@@ -785,7 -785,7 -785,7 -785,7 -785,7 -787,7 -785,7 -785,7 +787,7 @@@@@@@@@ config HID_XINM
                depends on HID
                ---help---
                Support for Xin-Mo devices that are not fully compliant with the HID
 -------        standard. Currently only supports the Xin-Mo Dual Arcade. Say Y here
 +++++++        standard. Currently only supports the Xin-Mo Dual Arcade. Say Y here
                if you have a Xin-Mo Dual Arcade controller.
        
        config HID_ZEROPLUS
@@@@@@@@@ -810,7 -810,7 -810,7 -810,7 -810,7 -812,7 -810,7 -810,7 +812,7 @@@@@@@@@ config HID_ZYDACRO
        
        config HID_SENSOR_HUB
                tristate "HID Sensors framework support"
--     -        depends on HID
++     +        depends on HID && HAS_IOMEM
                select MFD_CORE
                default n
                ---help---

diff --combined drivers/hid/hid-core.c
index dbe951092d9e53a3991ac7b8fdce0f503b947a4d,8ed66fd1ea87616416310884de0793d32ffabb6d,84ed7d4ba03d1149c649877829f44cd1ca9984d2,8ed66fd1ea87616416310884de0793d32ffabb6d,8ed66fd1ea87616416310884de0793d32ffabb6d,81b3bb6c4fd13e3c8b484c38ef2eb6806b17bce6,f10e768b4caf3059e6ed0536b77fc07564940b42,8ed66fd1ea87616416310884de0793d32ffabb6d..6c813c6092f8ddb5caa67a043c030efd5b953b0f
--- 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
--- 7/drivers/hid/hid-core.c
--- 8/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@@@@ -783,7 -783,7 -783,7 -783,7 -783,7 -783,7 -783,9 -783,7 +783,9 @@@@@@@@@ static int hid_scan_report(struct hid_d
                * Vendor specific handlings
                */
                if ((hid->vendor == USB_VENDOR_ID_SYNAPTICS) &&
------ -            (hid->group == HID_GROUP_GENERIC))
++++++ +            (hid->group == HID_GROUP_GENERIC) &&
++++++ +            /* only bind to the mouse interface of composite USB devices */
++++++ +            (hid->bus != BUS_USB || hid->type == HID_TYPE_USBMOUSE))
                        /* hid-rmi should take care of them, not hid-generic */
                        hid->group = HID_GROUP_RMI;
        
@@@@@@@@@ -1782,7 -1782,7 -1782,7 -1782,7 -1782,7 -1782,7 -1784,7 -1782,7 +1784,7 @@@@@@@@@ static const struct hid_device_id hid_h
                { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070) },
                { 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_HUION, USB_DEVICE_ID_HUION_580) },
++ +++++        { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },
                { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
                { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },
                { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
@@@@@@@@@ -1796,8 -1796,8 -1796,8 -1796,8 -1796,8 -1796,10 -1798,8 -1796,8 +1798,10 @@@@@@@@@
                { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },
                { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
                { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },
----- --#if IS_ENABLED(CONFIG_HID_LENOVO_TPKBD)
+++++ ++#if IS_ENABLED(CONFIG_HID_LENOVO)
                { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPKBD) },
+++++ ++        { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CUSBKBD) },
+++++ ++        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CBTKBD) },
        #endif
                { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
                { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
@@@@@@@@@ -2266,7 -2266,6 -2266,6 -2266,6 -2266,6 -2268,6 -2268,6 -2266,6 +2270,7 @@@@@@@@@ static const struct hid_device_id hid_i
                { HID_USB_DEVICE(USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA) },
                { HID_USB_DEVICE(USB_VENDOR_ID_JABRA, USB_DEVICE_ID_JABRA_SPEAK_410) },
                { HID_USB_DEVICE(USB_VENDOR_ID_JABRA, USB_DEVICE_ID_JABRA_SPEAK_510) },
 +++++++        { HID_USB_DEVICE(USB_VENDOR_ID_JABRA, USB_DEVICE_ID_JABRA_GN9350E) },
                { HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) },
                { HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) },
                { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },

diff --combined drivers/hid/hid-ids.h
index 5b2c55337586408cbaeae480a49a87f37149b581,6d00bb9366fa7fafe0f9d217e97801b6f0acf660,fe2f163b2b0c0cc09bab4785bd079cbb725504b0,48b66bbffc94bf7b7fe10b7228b1e26c12829ff6,48b66bbffc94bf7b7fe10b7228b1e26c12829ff6,315891d07521f854d5d842e7c12410a1a836ba76,48b66bbffc94bf7b7fe10b7228b1e26c12829ff6,6d00bb9366fa7fafe0f9d217e97801b6f0acf660..d53bdda26207e4fccd46f8d7eaac5cb952687950
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
--- 3/drivers/hid/hid-ids.h
--- 4/drivers/hid/hid-ids.h
--- 5/drivers/hid/hid-ids.h
--- 6/drivers/hid/hid-ids.h
--- 7/drivers/hid/hid-ids.h
--- 8/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@@@@@@@ -323,7 -323,6 -323,7 -323,7 -323,7 -323,7 -323,7 -323,6 +323,7 @@@@@@@@@
        
        #define USB_VENDOR_ID_ETURBOTOUCH       0x22b9
        #define USB_DEVICE_ID_ETURBOTOUCH       0x0006
 +     +#define USB_DEVICE_ID_ETURBOTOUCH_2968  0x2968
        
        #define USB_VENDOR_ID_EZKEY             0x0518
        #define USB_DEVICE_ID_BTC_8193          0x0002
@@@@@@@@@ -448,7 -447,7 -448,7 -448,7 -448,7 -448,7 -448,7 -447,7 +448,7 @@@@@@@@@
        #define USB_DEVICE_ID_UGCI_FIGHTING     0x0030
        
        #define USB_VENDOR_ID_HUION             0x256c
-- -----#define USB_DEVICE_ID_HUION_580         0x006e
++ +++++#define USB_DEVICE_ID_HUION_TABLET      0x006e
        
        #define USB_VENDOR_ID_IDEACOM           0x1cb6
        #define USB_DEVICE_ID_IDEACOM_IDC6650   0x6650
@@@@@@@@@ -479,7 -478,6 -479,6 -479,6 -479,6 -479,6 -479,6 -478,6 +479,7 @@@@@@@@@
        #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070     0xa070
        #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072     0xa072
        #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081     0xa081
 +++++++#define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A096  0xa096
        
        #define USB_VENDOR_ID_IMATION           0x0718
        #define USB_DEVICE_ID_DISC_STAKKA       0xd000
@@@@@@@@@ -490,7 -488,6 -489,6 -489,6 -489,6 -489,6 -489,6 -488,6 +490,7 @@@@@@@@@
        #define USB_VENDOR_ID_JABRA             0x0b0e
        #define USB_DEVICE_ID_JABRA_SPEAK_410   0x0412
        #define USB_DEVICE_ID_JABRA_SPEAK_510   0x0420
 +++++++#define USB_DEVICE_ID_JABRA_GN9350E     0x9350
        
        #define USB_VENDOR_ID_JESS              0x0c45
        #define USB_DEVICE_ID_JESS_YUREX        0x1010
@@@@@@@@@ -563,6 -560,6 -561,6 -561,6 -561,6 -561,8 -561,6 -560,6 +563,8 @@@@@@@@@
        
        #define USB_VENDOR_ID_LENOVO            0x17ef
        #define USB_DEVICE_ID_LENOVO_TPKBD      0x6009
+++++ ++#define USB_DEVICE_ID_LENOVO_CUSBKBD    0x6047
+++++ ++#define USB_DEVICE_ID_LENOVO_CBTKBD     0x6048
        
        #define USB_VENDOR_ID_LG                0x1fd2
        #define USB_DEVICE_ID_LG_MULTITOUCH     0x0064
@@@@@@@@@ -718,6 -715,6 -716,8 -716,8 -716,8 -718,8 -716,8 -715,6 +720,8 @@@@@@@@@
        
        #define USB_VENDOR_ID_PENMOUNT          0x14e1
        #define USB_DEVICE_ID_PENMOUNT_PCI      0x3500
++     +#define USB_DEVICE_ID_PENMOUNT_1610     0x1610
++     +#define USB_DEVICE_ID_PENMOUNT_1640     0x1640
        
        #define USB_VENDOR_ID_PETALYNX          0x18b1
        #define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE    0x0037

diff --combined drivers/hid/usbhid/hid-quirks.c
index 88e50653e257dd6deba9f7d4524194bd23537fe5,59badc10a08c8be862e273072bf639525c38726a,31e6727cd009fe2c9e22fcb65260fa2dc68bb6d1,31e6727cd009fe2c9e22fcb65260fa2dc68bb6d1,31e6727cd009fe2c9e22fcb65260fa2dc68bb6d1,31e6727cd009fe2c9e22fcb65260fa2dc68bb6d1,31e6727cd009fe2c9e22fcb65260fa2dc68bb6d1,59badc10a08c8be862e273072bf639525c38726a..0dd568170d6efc291030440d938674f6d202697d
--- 1/drivers/hid/usbhid/hid-quirks.c
--- 2/drivers/hid/usbhid/hid-quirks.c
--- 3/drivers/hid/usbhid/hid-quirks.c
--- 4/drivers/hid/usbhid/hid-quirks.c
--- 5/drivers/hid/usbhid/hid-quirks.c
--- 6/drivers/hid/usbhid/hid-quirks.c
--- 7/drivers/hid/usbhid/hid-quirks.c
--- 8/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@@@@@@@ -49,7 -49,6 -49,7 -49,7 -49,7 -49,7 -49,7 -49,6 +49,7 @@@@@@@@@ static const struct hid_blacklist 
        
                { USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II, HID_QUIRK_MULTI_INPUT },
                { USB_VENDOR_ID_ETURBOTOUCH, USB_DEVICE_ID_ETURBOTOUCH, HID_QUIRK_MULTI_INPUT },
 +     +        { USB_VENDOR_ID_ETURBOTOUCH, USB_DEVICE_ID_ETURBOTOUCH_2968, HID_QUIRK_MULTI_INPUT },
                { USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD, HID_QUIRK_MULTI_INPUT },
                { USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
                { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
@@@@@@@@@ -77,6 -76,6 -77,8 -77,8 -77,8 -77,8 -77,8 -76,6 +77,8 @@@@@@@@@
                { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GX680R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },
                { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },
                { USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS },
++     +        { USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_1610, HID_QUIRK_NOGET },
++     +        { USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_1640, HID_QUIRK_NOGET },
                { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS },
                { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
                { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },
@@@@@@@@@ -122,7 -121,6 -124,6 -124,6 -124,6 -124,6 -124,6 -121,6 +124,7 @@@@@@@@@
                { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_HD, HID_QUIRK_NO_INIT_REPORTS },
                { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_QUAD_HD, HID_QUIRK_NO_INIT_REPORTS },
                { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_TP_V103, HID_QUIRK_NO_INIT_REPORTS },
 +++++++        { USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A096, HID_QUIRK_NO_INIT_INPUT_REPORTS },
        
                { 0, 0 }
        };