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

Commit 68a49e51 authored by Frank Praznik's avatar Frank Praznik Committed by Jiri Kosina
Browse files

HID: sony: Add support for the third-party SMK PS3 Bluetooth Remote 



Add vid/pid for the SMK branded third-party PS3 Bluetooth remote and enable
support in the hid-sony driver.

Signed-off-by: default avatarFrank Praznik <frank.praznik@oh.rr.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 9b2b5c9a

drivers/hid/hid-core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1914,6 +1914,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SMK, USB_DEVICE_ID_SMK_PS3_BDREMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },

drivers/hid/hid-ids.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -813,6 +813,9 @@ 
#define USB_VENDOR_ID_SKYCABLE			0x1223

#define USB_VENDOR_ID_SKYCABLE			0x1223

#define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07

#define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07





#define USB_VENDOR_ID_SMK		0x0609

#define USB_DEVICE_ID_SMK_PS3_BDREMOTE	0x0306



#define USB_VENDOR_ID_SONY			0x054c

#define USB_VENDOR_ID_SONY			0x054c

#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b

#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b

#define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE	0x0374

#define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE	0x0374

drivers/hid/hid-sony.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -2113,6 +2113,9 @@ static const struct hid_device_id sony_devices[] = { 
	/* Logitech Harmony Adapter for PS3 */

	/* Logitech Harmony Adapter for PS3 */

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3),

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3),

		.driver_data = PS3REMOTE },

		.driver_data = PS3REMOTE },

	/* SMK-Link PS3 BD Remote Control */

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SMK, USB_DEVICE_ID_SMK_PS3_BDREMOTE),

		.driver_data = PS3REMOTE },

	/* Sony Dualshock 4 controllers for PS4 */

	/* Sony Dualshock 4 controllers for PS4 */

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),

		.driver_data = DUALSHOCK4_CONTROLLER_USB },

		.driver_data = DUALSHOCK4_CONTROLLER_USB },