drop alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch from older kernels

diff --git a/queue-4.19/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch b/queue-4.19/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
deleted file mode 100644 (file)
index e3d6113..0000000
--- a/queue-4.19/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4413665dd6c528b31284119e3571c25f371e1c36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Sch=C3=A4r?= <jan@jschaer.ch>
-Date: Tue, 29 Oct 2024 23:12:49 +0100
-Subject: ALSA: usb-audio: Add quirks for Dell WD19 dock
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jan Schär <jan@jschaer.ch>
-
-commit 4413665dd6c528b31284119e3571c25f371e1c36 upstream.
-
-The WD19 family of docks has the same audio chipset as the WD15. This
-change enables jack detection on the WD19.
-
-We don't need the dell_dock_mixer_init quirk for the WD19. It is only
-needed because of the dell_alc4020_map quirk for the WD15 in
-mixer_maps.c, which disables the volume controls. Even for the WD15,
-this quirk was apparently only needed when the dock firmware was not
-updated.
-
-Signed-off-by: Jan Schär <jan@jschaer.ch>
-Cc: <stable@vger.kernel.org>
-Link: https://patch.msgid.link/20241029221249.15661-1-jan@jschaer.ch
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/usb/mixer_quirks.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/sound/usb/mixer_quirks.c
-+++ b/sound/usb/mixer_quirks.c
-@@ -1903,6 +1903,9 @@ int snd_usb_mixer_apply_create_quirk(str
-       case USB_ID(0x1235, 0x800c): /* Focusrite Scarlett 18i20 */
-               err = snd_scarlett_controls_create(mixer);
-               break;
-+      case USB_ID(0x0bda, 0x402e): /* Dell WD19 dock */
-+              err = dell_dock_mixer_create(mixer);
-+              break;
- 
-       case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */
-               err = snd_soundblaster_e1_switch_create(mixer);

diff --git a/queue-4.19/series b/queue-4.19/series
index b2bf3c96019c6ca6ac793830695e2b805a86211d..cbe822685d26f3cc48ac264628dcda5f61270403 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -336,7 +336,6 @@ netfilter-nft_payload-sanitize-offset-and-length-bef.patch
 firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch
 net-amd-mvme147-fix-probe-banner-message.patch
 misc-sgi-gru-don-t-disable-preemption-in-gru-driver.patch
-alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
 usbip-tools-fix-detach_port-invalid-port-error-path.patch
 usb-phy-fix-api-devm_usb_put_phy-can-not-release-the-phy.patch
 xhci-fix-link-trb-dma-in-command-ring-stopped-completion-event.patch

diff --git a/queue-5.10/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch b/queue-5.10/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
deleted file mode 100644 (file)
index 430c902..0000000
--- a/queue-5.10/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4413665dd6c528b31284119e3571c25f371e1c36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Sch=C3=A4r?= <jan@jschaer.ch>
-Date: Tue, 29 Oct 2024 23:12:49 +0100
-Subject: ALSA: usb-audio: Add quirks for Dell WD19 dock
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jan Schär <jan@jschaer.ch>
-
-commit 4413665dd6c528b31284119e3571c25f371e1c36 upstream.
-
-The WD19 family of docks has the same audio chipset as the WD15. This
-change enables jack detection on the WD19.
-
-We don't need the dell_dock_mixer_init quirk for the WD19. It is only
-needed because of the dell_alc4020_map quirk for the WD15 in
-mixer_maps.c, which disables the volume controls. Even for the WD15,
-this quirk was apparently only needed when the dock firmware was not
-updated.
-
-Signed-off-by: Jan Schär <jan@jschaer.ch>
-Cc: <stable@vger.kernel.org>
-Link: https://patch.msgid.link/20241029221249.15661-1-jan@jschaer.ch
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/usb/mixer_quirks.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/sound/usb/mixer_quirks.c
-+++ b/sound/usb/mixer_quirks.c
-@@ -3026,6 +3026,9 @@ int snd_usb_mixer_apply_create_quirk(str
-       case USB_ID(0x0bda, 0x4014): /* Dell WD15 dock */
-               err = dell_dock_mixer_init(mixer);
-               break;
-+      case USB_ID(0x0bda, 0x402e): /* Dell WD19 dock */
-+              err = dell_dock_mixer_create(mixer);
-+              break;
- 
-       case USB_ID(0x2a39, 0x3fd2): /* RME ADI-2 Pro */
-       case USB_ID(0x2a39, 0x3fd3): /* RME ADI-2 DAC */

diff --git a/queue-5.10/series b/queue-5.10/series
index b4d86ef69d1853a76c8f3ebdf3b624197878c276..564bd74430cce5ad8bcaa885c5cf0d3de5ad7f9e 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -82,7 +82,6 @@ firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch
 net-amd-mvme147-fix-probe-banner-message.patch
 nfs-remove-revoked-delegation-from-server-s-delegati.patch
 misc-sgi-gru-don-t-disable-preemption-in-gru-driver.patch
-alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
 usbip-tools-fix-detach_port-invalid-port-error-path.patch
 usb-phy-fix-api-devm_usb_put_phy-can-not-release-the-phy.patch
 xhci-fix-link-trb-dma-in-command-ring-stopped-completion-event.patch

diff --git a/queue-5.15/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch b/queue-5.15/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
deleted file mode 100644 (file)
index 5396b25..0000000
--- a/queue-5.15/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4413665dd6c528b31284119e3571c25f371e1c36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Sch=C3=A4r?= <jan@jschaer.ch>
-Date: Tue, 29 Oct 2024 23:12:49 +0100
-Subject: ALSA: usb-audio: Add quirks for Dell WD19 dock
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jan Schär <jan@jschaer.ch>
-
-commit 4413665dd6c528b31284119e3571c25f371e1c36 upstream.
-
-The WD19 family of docks has the same audio chipset as the WD15. This
-change enables jack detection on the WD19.
-
-We don't need the dell_dock_mixer_init quirk for the WD19. It is only
-needed because of the dell_alc4020_map quirk for the WD15 in
-mixer_maps.c, which disables the volume controls. Even for the WD15,
-this quirk was apparently only needed when the dock firmware was not
-updated.
-
-Signed-off-by: Jan Schär <jan@jschaer.ch>
-Cc: <stable@vger.kernel.org>
-Link: https://patch.msgid.link/20241029221249.15661-1-jan@jschaer.ch
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/usb/mixer_quirks.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/sound/usb/mixer_quirks.c
-+++ b/sound/usb/mixer_quirks.c
-@@ -3274,6 +3274,9 @@ int snd_usb_mixer_apply_create_quirk(str
-       case USB_ID(0x0bda, 0x4014): /* Dell WD15 dock */
-               err = dell_dock_mixer_init(mixer);
-               break;
-+      case USB_ID(0x0bda, 0x402e): /* Dell WD19 dock */
-+              err = dell_dock_mixer_create(mixer);
-+              break;
- 
-       case USB_ID(0x2a39, 0x3fd2): /* RME ADI-2 Pro */
-       case USB_ID(0x2a39, 0x3fd3): /* RME ADI-2 DAC */

diff --git a/queue-5.15/series b/queue-5.15/series
index 01bd9ddb4cbdcd5ae9a6ac5bbbc47112551cbf3a..4cd1c1a3cdcb1b261ce6fb32c444d889ac0f322d 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -35,7 +35,6 @@ scsi-scsi_transport_fc-allow-setting-rport-state-to-.patch
 net-amd-mvme147-fix-probe-banner-message.patch
 nfs-remove-revoked-delegation-from-server-s-delegati.patch
 misc-sgi-gru-don-t-disable-preemption-in-gru-driver.patch
-alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
 usbip-tools-fix-detach_port-invalid-port-error-path.patch
 usb-phy-fix-api-devm_usb_put_phy-can-not-release-the-phy.patch
 usb-typec-fix-unreleased-fwnode_handle-in-typec_port_register_altmodes.patch

diff --git a/queue-5.4/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch b/queue-5.4/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
deleted file mode 100644 (file)
index 367ab1a..0000000
--- a/queue-5.4/alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4413665dd6c528b31284119e3571c25f371e1c36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Sch=C3=A4r?= <jan@jschaer.ch>
-Date: Tue, 29 Oct 2024 23:12:49 +0100
-Subject: ALSA: usb-audio: Add quirks for Dell WD19 dock
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jan Schär <jan@jschaer.ch>
-
-commit 4413665dd6c528b31284119e3571c25f371e1c36 upstream.
-
-The WD19 family of docks has the same audio chipset as the WD15. This
-change enables jack detection on the WD19.
-
-We don't need the dell_dock_mixer_init quirk for the WD19. It is only
-needed because of the dell_alc4020_map quirk for the WD15 in
-mixer_maps.c, which disables the volume controls. Even for the WD15,
-this quirk was apparently only needed when the dock firmware was not
-updated.
-
-Signed-off-by: Jan Schär <jan@jschaer.ch>
-Cc: <stable@vger.kernel.org>
-Link: https://patch.msgid.link/20241029221249.15661-1-jan@jschaer.ch
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/usb/mixer_quirks.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/sound/usb/mixer_quirks.c
-+++ b/sound/usb/mixer_quirks.c
-@@ -2277,6 +2277,9 @@ int snd_usb_mixer_apply_create_quirk(str
-       case USB_ID(0x0bda, 0x4014): /* Dell WD15 dock */
-               err = dell_dock_mixer_init(mixer);
-               break;
-+      case USB_ID(0x0bda, 0x402e): /* Dell WD19 dock */
-+              err = dell_dock_mixer_create(mixer);
-+              break;
- 
-       case USB_ID(0x2a39, 0x3fd2): /* RME ADI-2 Pro */
-       case USB_ID(0x2a39, 0x3fd3): /* RME ADI-2 DAC */

diff --git a/queue-5.4/series b/queue-5.4/series
index c3f58ce2da1d236180e346c8cc46ce607dbaf82d..dba5f85e0ad51ae4c70430e6a9dbbdc60d94898b 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -443,7 +443,6 @@ drivers-misc-ti-st-remove-unneeded-variable-in-st_tt.patch
 firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch
 net-amd-mvme147-fix-probe-banner-message.patch
 misc-sgi-gru-don-t-disable-preemption-in-gru-driver.patch
-alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch
 usbip-tools-fix-detach_port-invalid-port-error-path.patch
 usb-phy-fix-api-devm_usb_put_phy-can-not-release-the-phy.patch
 xhci-fix-link-trb-dma-in-command-ring-stopped-completion-event.patch