Merge branch 'for-5.12/playstation-v2' into for-linus

- Playstation DualSense support from Roderick Colenbrander

diff --combined drivers/hid/Makefile
index a0621a4,3cdbfb6..c4f6d5c
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -94,6 -94,7 +94,7 @@@ hid-picolcd-$(CONFIG_HID_PICOLCD_CIR) +
  hid-picolcd-$(CONFIG_DEBUG_FS)                += hid-picolcd_debugfs.o
  
  obj-$(CONFIG_HID_PLANTRONICS) += hid-plantronics.o
+ obj-$(CONFIG_HID_PLAYSTATION) += hid-playstation.o
  obj-$(CONFIG_HID_PRIMAX)      += hid-primax.o
  obj-$(CONFIG_HID_REDRAGON)    += hid-redragon.o
  obj-$(CONFIG_HID_RETRODE)     += hid-retrode.o
@@@ -138,7 -139,7 +139,7 @@@ obj-$(CONFIG_USB_HID)              += usbhid
  obj-$(CONFIG_USB_MOUSE)               += usbhid/
  obj-$(CONFIG_USB_KBD)         += usbhid/
  
 -obj-$(CONFIG_I2C_HID)         += i2c-hid/
 +obj-$(CONFIG_I2C_HID_CORE)    += i2c-hid/
  
  obj-$(CONFIG_INTEL_ISH_HID)   += intel-ish-hid/
  obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER)  += intel-ish-hid/

diff --combined drivers/hid/hid-ids.h
index abe6503,d6dd6b7..ae4c8ce
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -270,7 -270,6 +270,7 @@@
  #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_CHICONY_WIRELESS3       0x1236
  #define USB_DEVICE_ID_ASUS_AK1D               0x1125
  #define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A   0x1408
  #define USB_DEVICE_ID_CHICONY_ACER_SWITCH12   0x1421
@@@ -390,7 -389,6 +390,7 @@@
  #define USB_DEVICE_ID_TOSHIBA_CLICK_L9W       0x0401
  #define USB_DEVICE_ID_HP_X2           0x074d
  #define USB_DEVICE_ID_HP_X2_10_COVER  0x0755
 +#define I2C_DEVICE_ID_HP_SPECTRE_X360_15      0x2817
  #define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN  0x2706
  
  #define USB_VENDOR_ID_ELECOM          0x056e
@@@ -643,8 -641,6 +643,8 @@@
  #define USB_DEVICE_ID_INNEX_GENESIS_ATARI     0x4745
  
  #define USB_VENDOR_ID_ITE               0x048d
 +#define I2C_VENDOR_ID_ITE             0x103c
 +#define I2C_DEVICE_ID_ITE_VOYO_WINPAD_A15     0x184f
  #define USB_DEVICE_ID_ITE_LENOVO_YOGA   0x8386
  #define USB_DEVICE_ID_ITE_LENOVO_YOGA2  0x8350
  #define I2C_DEVICE_ID_ITE_LENOVO_LEGION_Y720  0x837a
@@@ -1077,6 -1073,7 +1077,7 @@@
  #define USB_DEVICE_ID_SONY_PS4_CONTROLLER     0x05c4
  #define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2   0x09cc
  #define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE      0x0ba0
+ #define USB_DEVICE_ID_SONY_PS5_CONTROLLER     0x0ce6
  #define USB_DEVICE_ID_SONY_MOTION_CONTROLLER  0x03d5
  #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER      0x042f
  #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER            0x0002