projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| a46f37db GKH |
1 | From cf1015d65d7c8a5504a4c03afb60fb86bff0f032 Mon Sep 17 00:00:00 2001 |
| 2 | From: Roderick Colenbrander <roderick.colenbrander@sony.com> | |
| 3 | Date: Fri, 7 Oct 2016 12:39:40 -0700 | |
| 4 | Subject: HID: sony: Update device ids | |
| 5 | ||
| 6 | From: Roderick Colenbrander <roderick.colenbrander@sony.com> | |
| 7 | ||
| 8 | commit cf1015d65d7c8a5504a4c03afb60fb86bff0f032 upstream. | |
| 9 | ||
| 10 | Support additional DS4 model. | |
| 11 | ||
| 12 | Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com> | |
| 13 | Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> | |
| 14 | Signed-off-by: Jiri Kosina <jkosina@suse.cz> | |
| 15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 16 | ||
| 17 | --- | |
| 18 | drivers/hid/hid-core.c | 2 ++ | |
| 19 | drivers/hid/hid-ids.h | 1 + | |
| 20 | drivers/hid/hid-sony.c | 4 ++++ | |
| 21 | 3 files changed, 7 insertions(+) | |
| 22 | ||
| 23 | --- a/drivers/hid/hid-core.c | |
| 24 | +++ b/drivers/hid/hid-core.c | |
| 25 | @@ -2059,6 +2059,8 @@ static const struct hid_device_id hid_ha | |
| 26 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, | |
| 27 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) }, | |
| 28 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) }, | |
| 29 | + { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) }, | |
| 30 | + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) }, | |
| 31 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, | |
| 32 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) }, | |
| 33 | { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER) }, | |
| 34 | --- a/drivers/hid/hid-ids.h | |
| 35 | +++ b/drivers/hid/hid-ids.h | |
| 36 | @@ -927,6 +927,7 @@ | |
| 37 | #define USB_DEVICE_ID_SONY_PS3_BDREMOTE 0x0306 | |
| 38 | #define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268 | |
| 39 | #define USB_DEVICE_ID_SONY_PS4_CONTROLLER 0x05c4 | |
| 40 | +#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 0x09cc | |
| 41 | #define USB_DEVICE_ID_SONY_MOTION_CONTROLLER 0x03d5 | |
| 42 | #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f | |
| 43 | #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002 | |
| 44 | --- a/drivers/hid/hid-sony.c | |
| 45 | +++ b/drivers/hid/hid-sony.c | |
| 46 | @@ -2581,6 +2581,10 @@ static const struct hid_device_id sony_d | |
| 47 | .driver_data = DUALSHOCK4_CONTROLLER_USB }, | |
| 48 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER), | |
| 49 | .driver_data = DUALSHOCK4_CONTROLLER_BT }, | |
| 50 | + { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2), | |
| 51 | + .driver_data = DUALSHOCK4_CONTROLLER_USB }, | |
| 52 | + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2), | |
| 53 | + .driver_data = DUALSHOCK4_CONTROLLER_BT }, | |
| 54 | /* Nyko Core Controller for PS3 */ | |
| 55 | { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER), | |
| 56 | .driver_data = SIXAXIS_CONTROLLER_USB | SINO_LITE_CONTROLLER }, |