From: Greg Kroah-Hartman Date: Tue, 5 Nov 2024 16:47:43 +0000 (+0100) Subject: drop alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch from older kernels X-Git-Tag: v4.19.323~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aa9fe643870805498027df482eedc10d3a0cdff;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index e3d6113a523..00000000000 --- 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?= -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 - -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 -Cc: -Link: https://patch.msgid.link/20241029221249.15661-1-jan@jschaer.ch -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - 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 b2bf3c96019..cbe822685d2 100644 --- 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 index 430c9027e41..00000000000 --- 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?= -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 - -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 -Cc: -Link: https://patch.msgid.link/20241029221249.15661-1-jan@jschaer.ch -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - 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 b4d86ef69d1..564bd74430c 100644 --- 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 index 5396b25d86a..00000000000 --- 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?= -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 - -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 -Cc: -Link: https://patch.msgid.link/20241029221249.15661-1-jan@jschaer.ch -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - 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 01bd9ddb4cb..4cd1c1a3cdc 100644 --- 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 index 367ab1a2d0c..00000000000 --- 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?= -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 - -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 -Cc: -Link: https://patch.msgid.link/20241029221249.15661-1-jan@jschaer.ch -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - 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 c3f58ce2da1..dba5f85e0ad 100644 --- 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