* [PATCH 4.4.y 0/2] HID: sony: backport DualShock 4 device ids
@ 2018-09-26 23:42 Roderick Colenbrander
2018-09-26 23:42 ` [PATCH 4.4.y 1/2] HID: sony: Update " Roderick Colenbrander
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Roderick Colenbrander @ 2018-09-26 23:42 UTC (permalink / raw)
To: stable; +Cc: Roderick Colenbrander
Hi,
We would like to request inclusion of updated DualShock 4 device ids for hid-sony
in Linux 4.4. Existing devices on older kernels already support the original
DualShock 4, but not recent hardware revisions. A similar backport was submitted
for 3.18/4.9. Kernels newer than 4.12 already include these patches.
The patches were cherry-picked from upstream and modified to apply cleanly and
compile.
Thanks,
Roderick Colenbrander
Roderick Colenbrander (2):
HID: sony: Update device ids
HID: sony: Support DS4 dongle
drivers/hid/hid-core.c | 3 +++
drivers/hid/hid-ids.h | 2 ++
drivers/hid/hid-sony.c | 6 ++++++
3 files changed, 11 insertions(+)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 4.4.y 1/2] HID: sony: Update device ids
2018-09-26 23:42 [PATCH 4.4.y 0/2] HID: sony: backport DualShock 4 device ids Roderick Colenbrander
@ 2018-09-26 23:42 ` Roderick Colenbrander
2018-09-26 23:42 ` [PATCH 4.4.y 2/2] HID: sony: Support DS4 dongle Roderick Colenbrander
2018-09-27 8:51 ` [PATCH 4.4.y 0/2] HID: sony: backport DualShock 4 device ids Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Roderick Colenbrander @ 2018-09-26 23:42 UTC (permalink / raw)
To: stable; +Cc: Roderick Colenbrander, Jiri Kosina
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>
---
drivers/hid/hid-core.c | 2 ++
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-sony.c | 4 ++++
3 files changed, 7 insertions(+)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e4541c6bf3d3..b992d8b010f8 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2011,6 +2011,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ 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) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 60e2c9faa95f..6e25168df6a2 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -879,6 +879,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_MOTION_CONTROLLER 0x03d5
#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f
#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 21febbb0d84e..979160e71156 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -2460,6 +2460,10 @@ static const struct hid_device_id sony_devices[] = {
.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);
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4.4.y 2/2] HID: sony: Support DS4 dongle
2018-09-26 23:42 [PATCH 4.4.y 0/2] HID: sony: backport DualShock 4 device ids Roderick Colenbrander
2018-09-26 23:42 ` [PATCH 4.4.y 1/2] HID: sony: Update " Roderick Colenbrander
@ 2018-09-26 23:42 ` Roderick Colenbrander
2018-09-27 8:51 ` [PATCH 4.4.y 0/2] HID: sony: backport DualShock 4 device ids Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Roderick Colenbrander @ 2018-09-26 23:42 UTC (permalink / raw)
To: stable; +Cc: Roderick Colenbrander, Jiri Kosina
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>
---
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-sony.c | 2 ++
3 files changed, 4 insertions(+)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b992d8b010f8..4564ecf71181 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2013,6 +2013,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ 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) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6e25168df6a2..00d8366a614e 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -880,6 +880,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_MOTION_CONTROLLER 0x03d5
#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f
#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 979160e71156..6f3d47185bf0 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -2464,6 +2464,8 @@ static const struct hid_device_id sony_devices[] = {
.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);
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 4.4.y 0/2] HID: sony: backport DualShock 4 device ids
2018-09-26 23:42 [PATCH 4.4.y 0/2] HID: sony: backport DualShock 4 device ids Roderick Colenbrander
2018-09-26 23:42 ` [PATCH 4.4.y 1/2] HID: sony: Update " Roderick Colenbrander
2018-09-26 23:42 ` [PATCH 4.4.y 2/2] HID: sony: Support DS4 dongle Roderick Colenbrander
@ 2018-09-27 8:51 ` Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2018-09-27 8:51 UTC (permalink / raw)
To: Roderick Colenbrander; +Cc: stable
On Wed, Sep 26, 2018 at 04:42:28PM -0700, Roderick Colenbrander wrote:
> Hi,
>
> We would like to request inclusion of updated DualShock 4 device ids for hid-sony
> in Linux 4.4. Existing devices on older kernels already support the original
> DualShock 4, but not recent hardware revisions. A similar backport was submitted
> for 3.18/4.9. Kernels newer than 4.12 already include these patches.
>
> The patches were cherry-picked from upstream and modified to apply cleanly and
> compile.
Now applied, thanks.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-27 15:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-26 23:42 [PATCH 4.4.y 0/2] HID: sony: backport DualShock 4 device ids Roderick Colenbrander
2018-09-26 23:42 ` [PATCH 4.4.y 1/2] HID: sony: Update " Roderick Colenbrander
2018-09-26 23:42 ` [PATCH 4.4.y 2/2] HID: sony: Support DS4 dongle Roderick Colenbrander
2018-09-27 8:51 ` [PATCH 4.4.y 0/2] HID: sony: backport DualShock 4 device ids Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.