3.18-stable patches

added patches:
	hid-sony-support-ds4-dongle.patch
	hid-sony-update-device-ids.patch

diff --git a/queue-3.18/hid-sony-support-ds4-dongle.patch b/queue-3.18/hid-sony-support-ds4-dongle.patch
new file mode 100644 (file)
index 0000000..46cc93f
--- /dev/null
+++ b/queue-3.18/hid-sony-support-ds4-dongle.patch
@@ -0,0 +1,54 @@
+From de66a1a04c25f2560a8dca7a95e2a150b0d5e17e Mon Sep 17 00:00:00 2001
+From: Roderick Colenbrander <roderick.colenbrander@sony.com>
+Date: Wed, 23 Nov 2016 14:07:11 -0800
+Subject: HID: sony: Support DS4 dongle
+
+From: Roderick Colenbrander <roderick.colenbrander@sony.com>
+
+commit de66a1a04c25f2560a8dca7a95e2a150b0d5e17e upstream.
+
+Add support for USB based DS4 dongle device, which allows connecting
+a DS4 through Bluetooth, but hides Bluetooth from the host system.
+
+Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ drivers/hid/hid-core.c |    1 +
+ drivers/hid/hid-ids.h  |    1 +
+ drivers/hid/hid-sony.c |    2 ++
+ 3 files changed, 4 insertions(+)
+
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1937,6 +1937,7 @@ static const struct hid_device_id hid_ha
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -847,6 +847,7 @@
+ #define USB_DEVICE_ID_SONY_PS3_CONTROLLER     0x0268
+ #define USB_DEVICE_ID_SONY_PS4_CONTROLLER     0x05c4
+ #define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2   0x09cc
++#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE      0x0ba0
+ #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER      0x042f
+ #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER            0x0002
+ #define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER   0x1000
+--- a/drivers/hid/hid-sony.c
++++ b/drivers/hid/hid-sony.c
+@@ -2046,6 +2046,8 @@ static const struct hid_device_id sony_d
+               .driver_data = DUALSHOCK4_CONTROLLER_USB },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
+               .driver_data = DUALSHOCK4_CONTROLLER_BT },
++      { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE),
++              .driver_data = DUALSHOCK4_CONTROLLER_USB },
+       { }
+ };
+ MODULE_DEVICE_TABLE(hid, sony_devices);

diff --git a/queue-3.18/hid-sony-update-device-ids.patch b/queue-3.18/hid-sony-update-device-ids.patch
new file mode 100644 (file)
index 0000000..75ef4c0
--- /dev/null
+++ b/queue-3.18/hid-sony-update-device-ids.patch
@@ -0,0 +1,56 @@
+From cf1015d65d7c8a5504a4c03afb60fb86bff0f032 Mon Sep 17 00:00:00 2001
+From: Roderick Colenbrander <roderick.colenbrander@sony.com>
+Date: Fri, 7 Oct 2016 12:39:40 -0700
+Subject: HID: sony: Update device ids
+
+From: Roderick Colenbrander <roderick.colenbrander@sony.com>
+
+commit cf1015d65d7c8a5504a4c03afb60fb86bff0f032 upstream.
+
+Support additional DS4 model.
+
+Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
+Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-core.c |    2 ++
+ drivers/hid/hid-ids.h  |    1 +
+ drivers/hid/hid-sony.c |    4 ++++
+ 3 files changed, 7 insertions(+)
+
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1935,6 +1935,8 @@ static const struct hid_device_id hid_ha
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
++      { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -846,6 +846,7 @@
+ #define USB_DEVICE_ID_SONY_PS3_BDREMOTE               0x0306
+ #define USB_DEVICE_ID_SONY_PS3_CONTROLLER     0x0268
+ #define USB_DEVICE_ID_SONY_PS4_CONTROLLER     0x05c4
++#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2   0x09cc
+ #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER      0x042f
+ #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER            0x0002
+ #define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER   0x1000
+--- a/drivers/hid/hid-sony.c
++++ b/drivers/hid/hid-sony.c
+@@ -2042,6 +2042,10 @@ static const struct hid_device_id sony_d
+               .driver_data = DUALSHOCK4_CONTROLLER_USB },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
+               .driver_data = DUALSHOCK4_CONTROLLER_BT },
++      { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
++              .driver_data = DUALSHOCK4_CONTROLLER_USB },
++      { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
++              .driver_data = DUALSHOCK4_CONTROLLER_BT },
+       { }
+ };
+ MODULE_DEVICE_TABLE(hid, sony_devices);

diff --git a/queue-3.18/series b/queue-3.18/series
index 29bee5156ee51b16e3650434c15bbe5e6dc929cb..bb1f088c9b06766dd721af663c6354113b186e79 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -15,3 +15,5 @@ ext4-recalucate-superblock-checksum-after-updating-free-blocks-inodes.patch
 ext4-fix-online-resize-s-handling-of-a-too-small-final-block-group.patch
 ext4-don-t-mark-mmp-buffer-head-dirty.patch
 arm64-add-trace_hardirqs_off-annotation-in-ret_to_user.patch
+hid-sony-update-device-ids.patch
+hid-sony-support-ds4-dongle.patch