aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Praznik <frank.praznik@oh.rr.com>2015-05-05 20:47:29 -0400
committerJiri Kosina <jkosina@suse.cz>2015-05-07 04:41:35 -0400
commit7c886d098d6128438e706ca4c068b8920fdac42d (patch)
treef4842eb883a0baef483893464c36411f8e8b5106
parent131a8a9a56f16d8d237b39a8677ccee44a355392 (diff)
HID: sony: Add the product ID for the Sony Motion Controller
Adds the PID for the Sony motion controller to the hardware ID list. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-ids.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 722a925795a2..2cb9ac7e74f5 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1961,6 +1961,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1961 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) }, 1961 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },
1962 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) }, 1962 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },
1963 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, 1963 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
1964 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_MOTION_CONTROLLER) },
1964 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) }, 1965 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },
1965 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, 1966 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
1966 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) }, 1967 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 41f167e4d75f..14fcb1103fb3 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -851,6 +851,7 @@
851#define USB_DEVICE_ID_SONY_PS3_BDREMOTE 0x0306 851#define USB_DEVICE_ID_SONY_PS3_BDREMOTE 0x0306
852#define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268 852#define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268
853#define USB_DEVICE_ID_SONY_PS4_CONTROLLER 0x05c4 853#define USB_DEVICE_ID_SONY_PS4_CONTROLLER 0x05c4
854#define USB_DEVICE_ID_SONY_MOTION_CONTROLLER 0x03d5
854#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f 855#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f
855#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002 856#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002
856#define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER 0x1000 857#define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER 0x1000