From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Roderick Colenbrander <roderick.colenbrander@sony.com>,
Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH 4.9 41/44] HID: sony: Support DS4 dongle
Date: Thu, 27 Sep 2018 11:04:30 +0200 [thread overview]
Message-ID: <20180927090124.365257428@linuxfoundation.org> (raw)
In-Reply-To: <20180927090117.997362691@linuxfoundation.org>
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
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
@@ -2061,6 +2061,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_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER) },
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -928,6 +928,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
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -2585,6 +2585,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 },
/* Nyko Core Controller for PS3 */
{ HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER),
.driver_data = SIXAXIS_CONTROLLER_USB | SINO_LITE_CONTROLLER },
next prev parent reply other threads:[~2018-09-27 9:32 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-27 9:03 [PATCH 4.9 00/44] 4.9.130-stable review Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 01/44] NFC: Fix possible memory corruption when handling SHDLC I-Frame commands Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 02/44] NFC: Fix the number of pipes Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 03/44] ASoC: cs4265: fix MMTLR Data switch control Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 04/44] ALSA: bebob: fix memory leak for M-Audio FW1814 and ProjectMix I/O at error path Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 05/44] ALSA: bebob: use address returned by kmalloc() instead of kernel stack for streaming DMA mapping Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 06/44] ALSA: emu10k1: fix possible info leak to userspace on SNDRV_EMU10K1_IOCTL_INFO Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 07/44] ALSA: firewire-digi00x: fix memory leak of private data Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 08/44] ALSA: firewire-tascam: " Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 09/44] ALSA: fireworks: fix memory leak of response buffer at error path Greg Kroah-Hartman
2018-09-27 9:03 ` [PATCH 4.9 10/44] ALSA: oxfw: fix memory leak for model-dependent data " Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 11/44] ALSA: oxfw: fix memory leak of discovered stream formats " Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 12/44] ALSA: oxfw: fix memory leak of private data Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 13/44] platform/x86: alienware-wmi: Correct a memory leak Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 14/44] xen/netfront: dont bug in case of too many frags Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 15/44] xen/x86/vpmu: Zero struct pt_regs before calling into sample handling code Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 16/44] Revert "PCI: Add ACS quirk for Intel 300 series" Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 17/44] ring-buffer: Allow for rescheduling when removing pages Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 18/44] mm: shmem.c: Correctly annotate new inodes for lockdep Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 19/44] gso_segment: Reset skb->mac_len after modifying network header Greg Kroah-Hartman
2018-09-27 9:04 ` Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 20/44] ipv6: fix possible use-after-free in ip6_xmit() Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 21/44] net/appletalk: fix minor pointer leak to userspace in SIOCFINDIPDDPRT Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 22/44] net: hp100: fix always-true check for link up state Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 23/44] udp4: fix IP_CMSG_CHECKSUM for connected sockets Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 24/44] neighbour: confirm neigh entries when ARP packet is received Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 25/44] scsi: target: iscsi: Use hex2bin instead of a re-implementation Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 26/44] ocfs2: fix ocfs2 read block panic Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 27/44] drm/nouveau/drm/nouveau: Fix bogus drm_kms_helper_poll_enable() placement Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 28/44] drm/nouveau/drm/nouveau: Use pm_runtime_get_noresume() in connector_detect() Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 29/44] drm/nouveau/drm/nouveau: Prevent handling ACPI HPD events too early Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 30/44] drm/vc4: Fix the "no scaling" case on multi-planar YUV formats Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 31/44] tty: vt_ioctl: fix potential Spectre v1 Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 32/44] ext4: check to make sure the rename(2)s destination is not freed Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 33/44] ext4: avoid divide by zero fault when deleting corrupted inline directories Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 34/44] ext4: recalucate superblock checksum after updating free blocks/inodes Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 35/44] ext4: fix online resizes handling of a too-small final block group Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 36/44] ext4: fix online resizing for bigalloc file systems with a 1k block size Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 37/44] ext4: dont mark mmp buffer head dirty Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 38/44] ext4: show test_dummy_encryption mount option in /proc/mounts Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 39/44] sched/fair: Fix vruntime_normalized() for remote non-migration wakeup Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 40/44] HID: sony: Update device ids Greg Kroah-Hartman
2018-09-27 9:04 ` Greg Kroah-Hartman [this message]
2018-09-27 9:04 ` [PATCH 4.9 42/44] PCI: aardvark: Size bridges before resources allocation Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 43/44] vmw_balloon: include asm/io.h Greg Kroah-Hartman
2018-09-27 9:04 ` [PATCH 4.9 44/44] iw_cxgb4: only allow 1 flush on user qps Greg Kroah-Hartman
2018-09-27 18:59 ` [PATCH 4.9 00/44] 4.9.130-stable review Nathan Chancellor
2018-09-27 19:51 ` Rafael David Tinoco
2018-09-27 20:14 ` Shuah Khan
2018-09-27 21:58 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180927090124.365257428@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=roderick.colenbrander@sony.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.