Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

HID: sony: Update device ids

Support additional DS4 model.

Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Roderick Colenbrander 9 years ago
parent
bdae9e0e95
commit
cf1015d65d
3 changed files with 7 additions and 0 deletions
Split View Show Diff Stats
  1. 2 0
      drivers/hid/hid-core.c
  2. 1 0
      drivers/hid/hid-ids.h
  3. 4 0
      drivers/hid/hid-sony.c

+ 2 - 0
drivers/hid/hid-core.c
View File 

@@ -2059,6 +2059,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
 
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
 
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
 
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER) },

+ 1 - 0
drivers/hid/hid-ids.h
View File 

@@ -899,6 +899,7 @@
 
 #define USB_DEVICE_ID_SONY_PS3_BDREMOTE		0x0306
 
 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268
 
 #define USB_DEVICE_ID_SONY_PS4_CONTROLLER	0x05c4
 
+#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2	0x09cc
 
 #define USB_DEVICE_ID_SONY_MOTION_CONTROLLER	0x03d5
 
 #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER	0x042f
 
 #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER		0x0002

+ 4 - 0
drivers/hid/hid-sony.c
View File 

@@ -2641,6 +2641,10 @@ static const struct hid_device_id sony_devices[] = {
 
 		.driver_data = DUALSHOCK4_CONTROLLER_USB },
 
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
 
 		.driver_data = DUALSHOCK4_CONTROLLER_BT },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
 
+		.driver_data = DUALSHOCK4_CONTROLLER_USB },
 
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
 
+		.driver_data = DUALSHOCK4_CONTROLLER_BT },
 
 	/* Nyko Core Controller for PS3 */
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER),
 
 		.driver_data = SIXAXIS_CONTROLLER_USB | SINO_LITE_CONTROLLER },