drop alsa patch for older kernels

diff --git a/queue-4.14/alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch b/queue-4.14/alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch
deleted file mode 100644 (file)
index 79becc7..0000000
--- a/queue-4.14/alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 7501f472977df233d039d86c6981e0641708e1ca Mon Sep 17 00:00:00 2001
-From: Geraldo Nascimento <geraldogabriel@gmail.com>
-Date: Wed, 3 May 2023 18:02:06 -0300
-Subject: ALSA: usb-audio: Add quirk for Pioneer DDJ-800
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Geraldo Nascimento <geraldogabriel@gmail.com>
-
-commit 7501f472977df233d039d86c6981e0641708e1ca upstream.
-
-One more Pioneer quirk, this time for DDJ-800, which is quite similar like
-other DJ DDJ models but with slightly different EPs or channels.
-
-Signed-off-by: Geraldo Nascimento <geraldogabriel@gmail.com>
-Tested-by: Grégory Desor <gregory.desor@free.fr>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/ZFLLzgEcsSF5aIHG@geday
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/usb/quirks-table.h |   58 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 58 insertions(+)
-
---- a/sound/usb/quirks-table.h
-+++ b/sound/usb/quirks-table.h
-@@ -3337,6 +3337,64 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge
-       }
- },
- 
-+{
-+      /*
-+       * PIONEER DJ DDJ-800
-+       * PCM is 6 channels out, 6 channels in @ 44.1 fixed
-+       * The Feedback for the output is the input
-+       */
-+      USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0029),
-+              .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+              .ifnum = QUIRK_ANY_INTERFACE,
-+              .type = QUIRK_COMPOSITE,
-+              .data = (const struct snd_usb_audio_quirk[]) {
-+                      {
-+                              .ifnum = 0,
-+                              .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-+                              .data = &(const struct audioformat) {
-+                                      .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-+                                      .channels = 6,
-+                                      .iface = 0,
-+                                      .altsetting = 1,
-+                                      .altset_idx = 1,
-+                                      .endpoint = 0x01,
-+                                      .ep_attr = USB_ENDPOINT_XFER_ISOC|
-+                                              USB_ENDPOINT_SYNC_ASYNC,
-+                                      .rates = SNDRV_PCM_RATE_44100,
-+                                      .rate_min = 44100,
-+                                      .rate_max = 44100,
-+                                      .nr_rates = 1,
-+                                      .rate_table = (unsigned int[]) { 44100 }
-+                              }
-+                      },
-+                      {
-+                              .ifnum = 0,
-+                              .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-+                              .data = &(const struct audioformat) {
-+                                      .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-+                                      .channels = 6,
-+                                      .iface = 0,
-+                                      .altsetting = 1,
-+                                      .altset_idx = 1,
-+                                      .endpoint = 0x82,
-+                                      .ep_idx = 1,
-+                                      .ep_attr = USB_ENDPOINT_XFER_ISOC|
-+                                              USB_ENDPOINT_SYNC_ASYNC|
-+                                      USB_ENDPOINT_USAGE_IMPLICIT_FB,
-+                                      .rates = SNDRV_PCM_RATE_44100,
-+                                      .rate_min = 44100,
-+                                      .rate_max = 44100,
-+                                      .nr_rates = 1,
-+                                      .rate_table = (unsigned int[]) { 44100 }
-+                              }
-+                      },
-+                      {
-+                              .ifnum = -1
-+                      }
-+              }
-+      }
-+},
-+
- /*
-  * MacroSilicon MS2100/MS2106 based AV capture cards
-  *

diff --git a/queue-4.14/series b/queue-4.14/series
index c553039c82626285eb3cf23c00767c9cb3f8d751..e2bf23adeb334b545f14a6751f865902a6e4b766 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -71,6 +71,5 @@ sunrpc-remove-the-maximum-number-of-retries-in-call_.patch
 phy-tegra-xusb-add-missing-tegra_xusb_port_unregiste.patch
 dmaengine-at_xdmac-do-not-enable-all-cyclic-channels.patch
 parisc-fix-argument-pointer-in-real64_call_asm.patch
-alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch
 nilfs2-do-not-write-dirty-data-after-degenerating-to-read-only.patch
 nilfs2-fix-infinite-loop-in-nilfs_mdt_get_block.patch

diff --git a/queue-4.19/alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch b/queue-4.19/alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch
deleted file mode 100644 (file)
index 49c17ea..0000000
--- a/queue-4.19/alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 7501f472977df233d039d86c6981e0641708e1ca Mon Sep 17 00:00:00 2001
-From: Geraldo Nascimento <geraldogabriel@gmail.com>
-Date: Wed, 3 May 2023 18:02:06 -0300
-Subject: ALSA: usb-audio: Add quirk for Pioneer DDJ-800
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Geraldo Nascimento <geraldogabriel@gmail.com>
-
-commit 7501f472977df233d039d86c6981e0641708e1ca upstream.
-
-One more Pioneer quirk, this time for DDJ-800, which is quite similar like
-other DJ DDJ models but with slightly different EPs or channels.
-
-Signed-off-by: Geraldo Nascimento <geraldogabriel@gmail.com>
-Tested-by: Grégory Desor <gregory.desor@free.fr>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/ZFLLzgEcsSF5aIHG@geday
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/usb/quirks-table.h |   58 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 58 insertions(+)
-
---- a/sound/usb/quirks-table.h
-+++ b/sound/usb/quirks-table.h
-@@ -3530,6 +3530,64 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* A
-       }
- },
- 
-+{
-+      /*
-+       * PIONEER DJ DDJ-800
-+       * PCM is 6 channels out, 6 channels in @ 44.1 fixed
-+       * The Feedback for the output is the input
-+       */
-+      USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0029),
-+              .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+              .ifnum = QUIRK_ANY_INTERFACE,
-+              .type = QUIRK_COMPOSITE,
-+              .data = (const struct snd_usb_audio_quirk[]) {
-+                      {
-+                              .ifnum = 0,
-+                              .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-+                              .data = &(const struct audioformat) {
-+                                      .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-+                                      .channels = 6,
-+                                      .iface = 0,
-+                                      .altsetting = 1,
-+                                      .altset_idx = 1,
-+                                      .endpoint = 0x01,
-+                                      .ep_attr = USB_ENDPOINT_XFER_ISOC|
-+                                              USB_ENDPOINT_SYNC_ASYNC,
-+                                      .rates = SNDRV_PCM_RATE_44100,
-+                                      .rate_min = 44100,
-+                                      .rate_max = 44100,
-+                                      .nr_rates = 1,
-+                                      .rate_table = (unsigned int[]) { 44100 }
-+                              }
-+                      },
-+                      {
-+                              .ifnum = 0,
-+                              .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-+                              .data = &(const struct audioformat) {
-+                                      .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-+                                      .channels = 6,
-+                                      .iface = 0,
-+                                      .altsetting = 1,
-+                                      .altset_idx = 1,
-+                                      .endpoint = 0x82,
-+                                      .ep_idx = 1,
-+                                      .ep_attr = USB_ENDPOINT_XFER_ISOC|
-+                                              USB_ENDPOINT_SYNC_ASYNC|
-+                                      USB_ENDPOINT_USAGE_IMPLICIT_FB,
-+                                      .rates = SNDRV_PCM_RATE_44100,
-+                                      .rate_min = 44100,
-+                                      .rate_max = 44100,
-+                                      .nr_rates = 1,
-+                                      .rate_table = (unsigned int[]) { 44100 }
-+                              }
-+                      },
-+                      {
-+                              .ifnum = -1
-+                      }
-+              }
-+      }
-+},
-+
- /*
-  * MacroSilicon MS2100/MS2106 based AV capture cards
-  *

diff --git a/queue-4.19/series b/queue-4.19/series
index 44e65a697009bd95111ce39e51d4a11890cc53ef..c6b903cddfb68e0cdf616b5960b61d5f6bf8451b 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -124,6 +124,5 @@ pwm-mtk-disp-disable-shadow-registers-before-setting.patch
 phy-tegra-xusb-add-missing-tegra_xusb_port_unregiste.patch
 dmaengine-at_xdmac-do-not-enable-all-cyclic-channels.patch
 parisc-fix-argument-pointer-in-real64_call_asm.patch
-alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch
 nilfs2-do-not-write-dirty-data-after-degenerating-to-read-only.patch
 nilfs2-fix-infinite-loop-in-nilfs_mdt_get_block.patch

diff --git a/queue-5.4/alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch b/queue-5.4/alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch
deleted file mode 100644 (file)
index 7297656..0000000
--- a/queue-5.4/alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 7501f472977df233d039d86c6981e0641708e1ca Mon Sep 17 00:00:00 2001
-From: Geraldo Nascimento <geraldogabriel@gmail.com>
-Date: Wed, 3 May 2023 18:02:06 -0300
-Subject: ALSA: usb-audio: Add quirk for Pioneer DDJ-800
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Geraldo Nascimento <geraldogabriel@gmail.com>
-
-commit 7501f472977df233d039d86c6981e0641708e1ca upstream.
-
-One more Pioneer quirk, this time for DDJ-800, which is quite similar like
-other DJ DDJ models but with slightly different EPs or channels.
-
-Signed-off-by: Geraldo Nascimento <geraldogabriel@gmail.com>
-Tested-by: Grégory Desor <gregory.desor@free.fr>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/ZFLLzgEcsSF5aIHG@geday
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/usb/quirks-table.h |   58 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 58 insertions(+)
-
---- a/sound/usb/quirks-table.h
-+++ b/sound/usb/quirks-table.h
-@@ -3763,6 +3763,64 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* A
-       }
- },
- 
-+{
-+      /*
-+       * PIONEER DJ DDJ-800
-+       * PCM is 6 channels out, 6 channels in @ 44.1 fixed
-+       * The Feedback for the output is the input
-+       */
-+      USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0029),
-+              .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+              .ifnum = QUIRK_ANY_INTERFACE,
-+              .type = QUIRK_COMPOSITE,
-+              .data = (const struct snd_usb_audio_quirk[]) {
-+                      {
-+                              .ifnum = 0,
-+                              .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-+                              .data = &(const struct audioformat) {
-+                                      .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-+                                      .channels = 6,
-+                                      .iface = 0,
-+                                      .altsetting = 1,
-+                                      .altset_idx = 1,
-+                                      .endpoint = 0x01,
-+                                      .ep_attr = USB_ENDPOINT_XFER_ISOC|
-+                                              USB_ENDPOINT_SYNC_ASYNC,
-+                                      .rates = SNDRV_PCM_RATE_44100,
-+                                      .rate_min = 44100,
-+                                      .rate_max = 44100,
-+                                      .nr_rates = 1,
-+                                      .rate_table = (unsigned int[]) { 44100 }
-+                              }
-+                      },
-+                      {
-+                              .ifnum = 0,
-+                              .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-+                              .data = &(const struct audioformat) {
-+                                      .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-+                                      .channels = 6,
-+                                      .iface = 0,
-+                                      .altsetting = 1,
-+                                      .altset_idx = 1,
-+                                      .endpoint = 0x82,
-+                                      .ep_idx = 1,
-+                                      .ep_attr = USB_ENDPOINT_XFER_ISOC|
-+                                              USB_ENDPOINT_SYNC_ASYNC|
-+                                      USB_ENDPOINT_USAGE_IMPLICIT_FB,
-+                                      .rates = SNDRV_PCM_RATE_44100,
-+                                      .rate_min = 44100,
-+                                      .rate_max = 44100,
-+                                      .nr_rates = 1,
-+                                      .rate_table = (unsigned int[]) { 44100 }
-+                              }
-+                      },
-+                      {
-+                              .ifnum = -1
-+                      }
-+              }
-+      }
-+},
-+
- /*
-  * MacroSilicon MS2100/MS2106 based AV capture cards
-  *

diff --git a/queue-5.4/series b/queue-5.4/series
index 3424d9f19da95103119bf1230a438df67c02293e..2b200070141b9fdd27ca16f08c7abaa7402edb35 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -192,7 +192,6 @@ dmaengine-dw-edma-fix-to-enable-to-issue-dma-request.patch
 dmaengine-at_xdmac-do-not-enable-all-cyclic-channels.patch
 afs-fix-updating-of-i_size-with-dv-jump-from-server.patch
 parisc-fix-argument-pointer-in-real64_call_asm.patch
-alsa-usb-audio-add-quirk-for-pioneer-ddj-800.patch
 alsa-hda-realtek-add-quirk-for-asus-um3402yar-using-cs35l41.patch
 nilfs2-do-not-write-dirty-data-after-degenerating-to-read-only.patch
 nilfs2-fix-infinite-loop-in-nilfs_mdt_get_block.patch