Merge branch 'for-5.13/plantronics' into for-linus

- Workaround for broken behavior of Plantronics Blackwire from Maxim
  Mikityanskiy

diff --combined drivers/hid/hid-ids.h
index 158f6ba69cde50daf29de7a30464eb882317dd94,4c74d8706b51c7705e71e003003309e157bc9ba4..84b8da3e7d09a71de6c782a5acce727224ba26e3
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -93,7 -93,6 +93,7 @@@
  #define BT_VENDOR_ID_APPLE            0x004c
  #define USB_DEVICE_ID_APPLE_MIGHTYMOUSE       0x0304
  #define USB_DEVICE_ID_APPLE_MAGICMOUSE        0x030d
 +#define USB_DEVICE_ID_APPLE_MAGICMOUSE2       0x0269
  #define USB_DEVICE_ID_APPLE_MAGICTRACKPAD     0x030e
  #define USB_DEVICE_ID_APPLE_MAGICTRACKPAD2    0x0265
  #define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI     0x020e
@@@ -195,7 -194,6 +195,7 @@@
  #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2 0x1837
  #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822
  #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD       0x1866
 +#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2      0x19b6
  #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD        0x1869
  
  #define USB_VENDOR_ID_ATEN            0x0557
@@@ -432,7 -430,6 +432,7 @@@
  
  #define USB_VENDOR_ID_FUTURE_TECHNOLOGY       0x0403
  #define USB_DEVICE_ID_RETRODE2                0x97c1
 +#define USB_DEVICE_ID_FT260             0x6030
  
  #define USB_VENDOR_ID_ESSENTIAL_REALITY       0x0d7f
  #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
@@@ -496,7 -493,6 +496,7 @@@
  #define USB_DEVICE_ID_GOOGLE_MASTERBALL       0x503c
  #define USB_DEVICE_ID_GOOGLE_MAGNEMITE        0x503d
  #define USB_DEVICE_ID_GOOGLE_MOONBALL 0x5044
 +#define USB_DEVICE_ID_GOOGLE_DON      0x5050
  
  #define USB_VENDOR_ID_GOTOP           0x08f2
  #define USB_DEVICE_ID_SUPER_Q2                0x007f
@@@ -810,7 -806,6 +810,7 @@@
  #define USB_DEVICE_ID_LOGITECH_27MHZ_MOUSE_RECEIVER   0xc51b
  #define USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER      0xc52b
  #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER          0xc52f
 +#define USB_DEVICE_ID_LOGITECH_G700_RECEIVER          0xc531
  #define USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2    0xc532
  #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2                0xc534
  #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1     0xc539
@@@ -819,14 -814,8 +819,14 @@@
  #define USB_DEVICE_ID_SPACETRAVELLER  0xc623
  #define USB_DEVICE_ID_SPACENAVIGATOR  0xc626
  #define USB_DEVICE_ID_DINOVO_DESKTOP  0xc704
 -#define USB_DEVICE_ID_DINOVO_EDGE     0xc714
 -#define USB_DEVICE_ID_DINOVO_MINI     0xc71f
 +#define USB_DEVICE_ID_MX5000_RECEIVER_MOUSE_DEV               0xc70a
 +#define USB_DEVICE_ID_MX5000_RECEIVER_KBD_DEV         0xc70e
 +#define USB_DEVICE_ID_DINOVO_EDGE_RECEIVER_KBD_DEV    0xc713
 +#define USB_DEVICE_ID_DINOVO_EDGE_RECEIVER_MOUSE_DEV  0xc714
 +#define USB_DEVICE_ID_MX5500_RECEIVER_KBD_DEV         0xc71b
 +#define USB_DEVICE_ID_MX5500_RECEIVER_MOUSE_DEV               0xc71c
 +#define USB_DEVICE_ID_DINOVO_MINI_RECEIVER_KBD_DEV    0xc71e
 +#define USB_DEVICE_ID_DINOVO_MINI_RECEIVER_MOUSE_DEV  0xc71f
  #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2    0xca03
  #define USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL        0xca04
  
@@@ -955,6 -944,7 +955,7 @@@
  #define USB_DEVICE_ID_ORTEK_IHOME_IMAC_A210S  0x8003
  
  #define USB_VENDOR_ID_PLANTRONICS     0x047f
+ #define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3220_SERIES       0xc056
  
  #define USB_VENDOR_ID_PANASONIC               0x04da
  #define USB_DEVICE_ID_PANABOARD_UBT780        0x1044

diff --combined include/linux/hid.h
index b40e1abbe11da85a9bceb060b3b5de2cb2a9373e,3e33eb14118c85375469ad4e6a36c5661d450ead..271021e20a3f8d468bd507c7178ae2691a70cabd
--- 1/include/linux/hid.h
--- 2/include/linux/hid.h
+++ b/include/linux/hid.h
@@@ -153,7 -153,6 +153,7 @@@ struct hid_item 
  #define HID_UP_CONSUMER               0x000c0000
  #define HID_UP_DIGITIZER      0x000d0000
  #define HID_UP_PID            0x000f0000
 +#define HID_UP_BATTERY                0x00850000
  #define HID_UP_HPVENDOR         0xff7f0000
  #define HID_UP_HPVENDOR2        0xff010000
  #define HID_UP_MSVENDOR               0xff000000
@@@ -263,6 -262,8 +263,8 @@@
  #define HID_CP_SELECTION      0x000c0080
  #define HID_CP_MEDIASELECTION 0x000c0087
  #define HID_CP_SELECTDISC     0x000c00ba
+ #define HID_CP_VOLUMEUP               0x000c00e9
+ #define HID_CP_VOLUMEDOWN     0x000c00ea
  #define HID_CP_PLAYBACKSPEED  0x000c00f1
  #define HID_CP_PROXIMITY      0x000c0109
  #define HID_CP_SPEAKERSYSTEM  0x000c0160
@@@ -298,8 -299,6 +300,8 @@@
  #define HID_DG_TOOLSERIALNUMBER       0x000d005b
  #define HID_DG_LATENCYMODE    0x000d0060
  
 +#define HID_BAT_ABSOLUTESTATEOFCHARGE 0x00850065
 +
  #define HID_VD_ASUS_CUSTOM_MEDIA_KEYS 0xff310076
  /*
   * HID report types --- Ouch! HID spec says 1 2 3!