diff options
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-sony.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 5ed2f572430f..1ed841b149e8 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -2061,6 +2061,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 2061 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) }, | 2061 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) }, |
| 2062 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) }, | 2062 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) }, |
| 2063 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) }, | 2063 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) }, |
| 2064 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE) }, | ||
| 2064 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, | 2065 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, |
| 2065 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) }, | 2066 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) }, |
| 2066 | { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER) }, | 2067 | { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 27f82cc4ada4..dc7e39432320 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -900,6 +900,7 @@ | |||
| 900 | #define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268 | 900 | #define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268 |
| 901 | #define USB_DEVICE_ID_SONY_PS4_CONTROLLER 0x05c4 | 901 | #define USB_DEVICE_ID_SONY_PS4_CONTROLLER 0x05c4 |
| 902 | #define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 0x09cc | 902 | #define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 0x09cc |
| 903 | #define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE 0x0ba0 | ||
| 903 | #define USB_DEVICE_ID_SONY_MOTION_CONTROLLER 0x03d5 | 904 | #define USB_DEVICE_ID_SONY_MOTION_CONTROLLER 0x03d5 |
| 904 | #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f | 905 | #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f |
| 905 | #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002 | 906 | #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002 |
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index d8889d681687..7687c0875395 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c | |||
| @@ -2791,6 +2791,8 @@ static const struct hid_device_id sony_devices[] = { | |||
| 2791 | .driver_data = DUALSHOCK4_CONTROLLER_USB }, | 2791 | .driver_data = DUALSHOCK4_CONTROLLER_USB }, |
| 2792 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2), | 2792 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2), |
| 2793 | .driver_data = DUALSHOCK4_CONTROLLER_BT }, | 2793 | .driver_data = DUALSHOCK4_CONTROLLER_BT }, |
| 2794 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE), | ||
| 2795 | .driver_data = DUALSHOCK4_CONTROLLER_USB }, | ||
| 2794 | /* Nyko Core Controller for PS3 */ | 2796 | /* Nyko Core Controller for PS3 */ |
| 2795 | { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER), | 2797 | { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER), |
| 2796 | .driver_data = SIXAXIS_CONTROLLER_USB | SINO_LITE_CONTROLLER }, | 2798 | .driver_data = SIXAXIS_CONTROLLER_USB | SINO_LITE_CONTROLLER }, |
