Commit e2adf27e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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

- Playstation DualSense support from Roderick Colenbrander
parents 31d31fa5 949aaccd

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7928,6 +7928,12 @@ F: drivers/hid/ 
F:	include/linux/hid*

F:	include/uapi/linux/hid*









HID PLAYSTATION DRIVER









M:	Roderick Colenbrander <roderick.colenbrander@sony.com>









L:	linux-input@vger.kernel.org









S:	Supported









F:	drivers/hid/hid-playstation.c

















HID SENSOR HUB DRIVERS









M:	Jiri Kosina <jikos@kernel.org>









M:	Jonathan Cameron <jic23@kernel.org>
































drivers/hid/Kconfig



+18
−0






























Original line number
Diff line number
Diff line







@@ -853,6 +853,24 @@ config HID_PLANTRONICS

















	  Say M here if you may ever plug in a Plantronics USB audio device.



















config HID_PLAYSTATION









	tristate "PlayStation HID Driver"









	depends on HID









	select CRC32









	select POWER_SUPPLY









	help









	  Provides support for Sony PS5 controllers including support for









	  its special functionalities e.g. touchpad, lights and motion









	  sensors.



















config PLAYSTATION_FF









	bool "PlayStation force feedback support"









	depends on HID_PLAYSTATION









	select INPUT_FF_MEMLESS









	help









	  Say Y here if you would like to enable force feedback support for









	  PlayStation game controllers.



















config HID_PRIMAX









	tristate "Primax non-fully HID-compliant devices"









	depends on HID
































drivers/hid/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -94,6 +94,7 @@ hid-picolcd-$(CONFIG_HID_PICOLCD_CIR)	+= hid-picolcd_cir.o







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
































drivers/hid/hid-ids.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -1077,6 +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
































drivers/hid/hid-playstation.c
0 → 100644



+1351
−0




























File added.
Preview size limit exceeded, changes collapsed.