diff options
author | Frank Praznik <frank.praznik@oh.rr.com> | 2014-11-12 14:52:28 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 09:05:27 -0500 |
commit | 68a49e51a4a9c500d950f893f1758c5ac13b7c8b (patch) | |
tree | 2a29330b1804169c2050d2c973fb3c244ee7c2ee | |
parent | 9b2b5c9a790743ccb2516f1a86671d5df9c6c5cd (diff) |
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: Frank Praznik <frank.praznik@oh.rr.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/hid/hid-sony.c | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 3402033fa52a..0ab6d6af54c8 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1914,6 +1914,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1914 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, | 1914 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, |
1915 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, | 1915 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, |
1916 | { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, | 1916 | { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, |
1917 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SMK, USB_DEVICE_ID_SMK_PS3_BDREMOTE) }, | ||
1917 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) }, | 1918 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) }, |
1918 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) }, | 1919 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) }, |
1919 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) }, | 1920 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 7c863738e419..27e0f5188d08 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -813,6 +813,9 @@ | |||
813 | #define USB_VENDOR_ID_SKYCABLE 0x1223 | 813 | #define USB_VENDOR_ID_SKYCABLE 0x1223 |
814 | #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 | 814 | #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 |
815 | 815 | ||
816 | #define USB_VENDOR_ID_SMK 0x0609 | ||
817 | #define USB_DEVICE_ID_SMK_PS3_BDREMOTE 0x0306 | ||
818 | |||
816 | #define USB_VENDOR_ID_SONY 0x054c | 819 | #define USB_VENDOR_ID_SONY 0x054c |
817 | #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b | 820 | #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b |
818 | #define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE 0x0374 | 821 | #define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE 0x0374 |
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index b6e610289e9d..31e9d2561106 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c | |||
@@ -2113,6 +2113,9 @@ static const struct hid_device_id sony_devices[] = { | |||
2113 | /* Logitech Harmony Adapter for PS3 */ | 2113 | /* Logitech Harmony Adapter for PS3 */ |
2114 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3), | 2114 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3), |
2115 | .driver_data = PS3REMOTE }, | 2115 | .driver_data = PS3REMOTE }, |
2116 | /* SMK-Link PS3 BD Remote Control */ | ||
2117 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SMK, USB_DEVICE_ID_SMK_PS3_BDREMOTE), | ||
2118 | .driver_data = PS3REMOTE }, | ||
2116 | /* Sony Dualshock 4 controllers for PS4 */ | 2119 | /* Sony Dualshock 4 controllers for PS4 */ |
2117 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER), | 2120 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER), |
2118 | .driver_data = DUALSHOCK4_CONTROLLER_USB }, | 2121 | .driver_data = DUALSHOCK4_CONTROLLER_USB }, |