Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88fc9f86 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Greg Kroah-Hartman
Browse files

HID: sony: Update device ids 



commit cf1015d65d7c8a5504a4c03afb60fb86bff0f032 upstream.

Support additional DS4 model.

Signed-off-by: default avatarRoderick Colenbrander <roderick.colenbrander@sony.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e290d8b

drivers/hid/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1935,6 +1935,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_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -846,6 +846,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_NAVIGATION_CONTROLLER	0x042f

#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER		0x0002

#define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER	0x1000

drivers/hid/hid-sony.c

+4 −0
Original line number Diff line number Diff line
@@ -2042,6 +2042,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 },

	{ }

};

MODULE_DEVICE_TABLE(hid, sony_devices);