drop queue-5.15/alsa-usb-audio-add-quirk-for-microsoft-modern-wirele.patch

It broke the build

diff --git a/queue-5.15/alsa-usb-audio-add-quirk-for-microsoft-modern-wirele.patch b/queue-5.15/alsa-usb-audio-add-quirk-for-microsoft-modern-wirele.patch
deleted file mode 100644 (file)
index 5e3650d..0000000
--- a/queue-5.15/alsa-usb-audio-add-quirk-for-microsoft-modern-wirele.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 65e2bff9d27f9b67c68fc350a87f817652fa557a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Jul 2023 11:20:57 +0200
-Subject: ALSA: usb-audio: Add quirk for Microsoft Modern Wireless Headset
-
-From: Takashi Iwai <tiwai@suse.de>
-
-[ Upstream commit 3da435063777f8d861ba5a165344e3f75f839357 ]
-
-Microsoft Modern Wireless Headset (appearing on the host as "Microsoft
-USB Link") has a playback and a capture mixer volume/switch, but they
-are fairly broken.  The descriptor reports wrong dB ranges for
-playback, and the capture volume/switch don't influence on the actual
-recording at all.  Moreover, there seem instabilities in the
-connection, and at best, we should disable the runtime PM.
-
-So this ended up with a quirk entry for:
-- Correct the playback dB range;
-  I picked up some reasonable values but it's a guess work
-- Disable the capture mixer;
-  it's completely useless and confuses PA/PW
-- Suppress get-sample-rate, apply the delay for message handling,
-  and suppress the auto-suspend
-
-The behavior of the wheel control on the headset is somehow flaky,
-too, but it's an issue of HID.
-
-Link: https://bugzilla.suse.com/show_bug.cgi?id=1207129
-Link: https://lore.kernel.org/r/20230725092057.15115-1-tiwai@suse.de
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/usb/mixer_maps.c | 14 ++++++++++++++
- sound/usb/quirks.c     |  3 +++
- 2 files changed, 17 insertions(+)
-
-diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c
-index 3f8f6056ff6a5..8e0915f02b26f 100644
---- a/sound/usb/mixer_maps.c
-+++ b/sound/usb/mixer_maps.c
-@@ -366,6 +366,15 @@ static const struct usbmix_name_map corsair_virtuoso_map[] = {
-       { 0 }
- };
- 
-+/* Microsoft USB Link headset */
-+/* a guess work: raw playback volume values are from 2 to 129 */
-+static const struct usbmix_dB_map ms_usb_link_dB = { -3225, 0, true };
-+static const struct usbmix_name_map ms_usb_link_map[] = {
-+      { 9, NULL, .dB = &ms_usb_link_dB },
-+      { 10, NULL }, /* Headset Capture volume; seems non-working, disabled */
-+      { 0 }   /* terminator */
-+};
-+
- /* ASUS ROG Zenith II with Realtek ALC1220-VB */
- static const struct usbmix_name_map asus_zenith_ii_map[] = {
-       { 19, NULL, 12 }, /* FU, Input Gain Pad - broken response, disabled */
-@@ -625,6 +634,11 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = {
-               .id = USB_ID(0x1395, 0x0025),
-               .map = sennheiser_pc8_map,
-       },
-+      {
-+              /* Microsoft USB Link headset */
-+              .id = USB_ID(0x045e, 0x083c),
-+              .map = ms_usb_link_map,
-+      },
-       { 0 } /* terminator */
- };
- 
-diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
-index 8de572e774ddc..e5eab3b84b3f7 100644
---- a/sound/usb/quirks.c
-+++ b/sound/usb/quirks.c
-@@ -1747,6 +1747,9 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
-                  QUIRK_FLAG_IGNORE_CTL_ERROR),
-       DEVICE_FLG(0x041e, 0x4080, /* Creative Live Cam VF0610 */
-                  QUIRK_FLAG_GET_SAMPLE_RATE),
-+      DEVICE_FLG(0x045e, 0x083c, /* MS USB Link headset */
-+                 QUIRK_FLAG_GET_SAMPLE_RATE | QUIRK_FLAG_CTL_MSG_DELAY |
-+                 QUIRK_FLAG_DISABLE_AUTOSUSPEND),
-       DEVICE_FLG(0x046d, 0x084c, /* Logitech ConferenceCam Connect */
-                  QUIRK_FLAG_GET_SAMPLE_RATE | QUIRK_FLAG_CTL_MSG_DELAY_1M),
-       DEVICE_FLG(0x046d, 0x0991, /* Logitech QuickCam Pro */
--- 
-2.40.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 7e16d3bd5ef2afb7c8b8a76ebcf2562674fdc305..c778a8c2226eecfd18a74c12a06436918c2a53c8 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -21,7 +21,6 @@ asoc-codecs-es8316-fix-dmic-config.patch
 asoc-rt711-fix-for-jd-event-handling-in-clockstop-mo.patch
 asoc-rt711-sdca-fix-for-jd-event-handling-in-clockst.patch
 asoc-atmel-fix-the-8k-sample-parameter-in-i2sc-maste.patch
-alsa-usb-audio-add-quirk-for-microsoft-modern-wirele.patch
 platform-x86-intel-hid-always-call-btnl-acpi-method.patch
 platform-x86-intel-hid-add-hp-dragonfly-g2-to-vgbs-d.patch
 platform-x86-huawei-wmi-silence-ambient-light-sensor.patch