--- /dev/null
+From foo@baz Thu Nov 4 01:08:08 PM CET 2021
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 4 Nov 2021 12:23:09 +0100
+Subject: ALSA: usb-audio: Add Audient iD14 to mixer map quirk table
+To: stable@vger.kernel.org
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org
+Message-ID: <20211104112309.30984-3-tiwai@suse.de>
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit df0380b9539b04c1ae8854a984098da06d5f1e67 upstream.
+
+This is a fix equivalent with the upstream commit df0380b9539b ("ALSA:
+usb-audio: Add quirk for Audient iD14"), adapted to the earlier
+kernels up to 5.14.y. It adds the quirk entry with the old
+ignore_ctl_error flag to the usbmix_ctl_maps, instead.
+
+The original commit description says:
+ Audient iD14 (2708:0002) may get a control message error that
+ interferes the operation e.g. with alsactl. Add the quirk to ignore
+ such errors like other devices.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/mixer_maps.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sound/usb/mixer_maps.c
++++ b/sound/usb/mixer_maps.c
+@@ -529,6 +529,10 @@ static const struct usbmix_ctl_map usbmi
+ .map = maya44_map,
+ },
+ {
++ .id = USB_ID(0x2708, 0x0002), /* Audient iD14 */
++ .ignore_ctl_error = 1,
++ },
++ {
+ /* KEF X300A */
+ .id = USB_ID(0x27ac, 0x1000),
+ .map = scms_usb3318_map,
--- /dev/null
+From foo@baz Thu Nov 4 01:08:08 PM CET 2021
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 4 Nov 2021 12:23:08 +0100
+Subject: ALSA: usb-audio: Add Schiit Hel device to mixer map quirk table
+To: stable@vger.kernel.org
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org
+Message-ID: <20211104112309.30984-2-tiwai@suse.de>
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 22390ce786c59328ccd13c329959dee1e8757487 upstream.
+
+This is a fix equivalent with the upstream commit 22390ce786c5 ("ALSA:
+usb-audio: add Schiit Hel device to quirk table"), adapted to the
+earlier kernels up to 5.14.y. It adds the quirk entry with the old
+ignore_ctl_error flag to the usbmix_ctl_maps, instead.
+
+The original patch description says:
+ The Shciit Hel device responds to the ctl message for the mic capture
+ switch with a timeout of -EPIPE:
+
+ usb 7-2.2: cannot get ctl value: req = 0x81, wValue = 0x100, wIndex = 0x1100, type = 1
+ usb 7-2.2: cannot get ctl value: req = 0x81, wValue = 0x100, wIndex = 0x1100, type = 1
+ usb 7-2.2: cannot get ctl value: req = 0x81, wValue = 0x100, wIndex = 0x1100, type = 1
+ usb 7-2.2: cannot get ctl value: req = 0x81, wValue = 0x100, wIndex = 0x1100, type = 1
+
+ This seems safe to ignore as the device works properly with the control
+ message quirk, so add it to the quirk table so all is good.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/mixer_maps.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sound/usb/mixer_maps.c
++++ b/sound/usb/mixer_maps.c
+@@ -539,6 +539,10 @@ static const struct usbmix_ctl_map usbmi
+ .map = scms_usb3318_map,
+ },
+ {
++ .id = USB_ID(0x30be, 0x0101), /* Schiit Hel */
++ .ignore_ctl_error = 1,
++ },
++ {
+ /* Bose Companion 5 */
+ .id = USB_ID(0x05a7, 0x1020),
+ .map = bose_companion5_map,
+++ /dev/null
-From 0398adaec3419bdfa93baae70a3b696b4abdd7ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 8 Oct 2021 22:59:36 +0200
-Subject: Revert "dt-bindings: pinctrl: bcm4708-pinmux: rework binding to use syscon"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Rafał Miłecki <rafal@milecki.pl>
-
-commit 0398adaec3419bdfa93baae70a3b696b4abdd7ad upstream.
-
-This reverts commit 2ae80900f239484069569380e1fc4340fd6e0089.
-
-My rework was unneeded & wrong. It replaced a clear & correct "reg"
-property usage with a custom "offset" one.
-
-Back then I didn't understand how to properly handle CRU block binding.
-I heard / read about syscon and tried to use it in a totally invalid
-way. That change also missed Rob's review (obviously).
-
-Northstar's pin controller is a simple consistent hardware block that
-can be cleanly mapped using a 0x24 long reg space.
-
-Since the rework commit there wasn't any follow up modifying in-kernel
-DTS files to use the new binding. Broadcom also isn't known to use that
-bugged binding. There is close to zero chance this revert may actually
-cause problems / regressions.
-
-This commit is a simple revert. Example binding may (should) be updated
-/ cleaned up but that can be handled separately.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Reviewed-by: Rob Herring <robh@kernel.org>
-Link: https://lore.kernel.org/r/20211008205938.29925-1-zajec5@gmail.com
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- .../devicetree/bindings/mfd/brcm,cru.yaml | 11 +++++----
- .../bindings/pinctrl/brcm,ns-pinmux.yaml | 23 +++++++++++--------
- 2 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/Documentation/devicetree/bindings/mfd/brcm,cru.yaml b/Documentation/devicetree/bindings/mfd/brcm,cru.yaml
-index fc1317ab3226..28ac60acf4ac 100644
---- a/Documentation/devicetree/bindings/mfd/brcm,cru.yaml
-+++ b/Documentation/devicetree/bindings/mfd/brcm,cru.yaml
-@@ -32,13 +32,13 @@ properties:
- "#size-cells":
- const: 1
-
-- pinctrl:
-- $ref: ../pinctrl/brcm,ns-pinmux.yaml
--
- patternProperties:
- '^clock-controller@[a-f0-9]+$':
- $ref: ../clock/brcm,iproc-clocks.yaml
-
-+ '^pin-controller@[a-f0-9]+$':
-+ $ref: ../pinctrl/brcm,ns-pinmux.yaml
-+
- '^thermal@[a-f0-9]+$':
- $ref: ../thermal/brcm,ns-thermal.yaml
-
-@@ -73,9 +73,10 @@ examples:
- "iprocfast", "sata1", "sata2";
- };
-
-- pinctrl {
-+ pin-controller@1c0 {
- compatible = "brcm,bcm4708-pinmux";
-- offset = <0x1c0>;
-+ reg = <0x1c0 0x24>;
-+ reg-names = "cru_gpio_control";
- };
-
- thermal@2c0 {
-diff --git a/Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml b/Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml
-index 470aff599c27..78600a8fe403 100644
---- a/Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml
-+++ b/Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml
-@@ -17,9 +17,6 @@ description:
-
- A list of pins varies across chipsets so few bindings are available.
-
-- Node of the pinmux must be nested in the CRU (Central Resource Unit) "syscon"
-- node.
--
- properties:
- compatible:
- enum:
-@@ -27,10 +24,11 @@ properties:
- - brcm,bcm4709-pinmux
- - brcm,bcm53012-pinmux
-
-- offset:
-- description: offset of pin registers in the CRU block
-+ reg:
- maxItems: 1
-- $ref: /schemas/types.yaml#/definitions/uint32-array
-+
-+ reg-names:
-+ const: cru_gpio_control
-
- patternProperties:
- '-pins$':
-@@ -72,19 +70,24 @@ allOf:
- uart1_grp ]
-
- required:
-- - offset
-+ - reg
-+ - reg-names
-
- additionalProperties: false
-
- examples:
- - |
- cru@1800c100 {
-- compatible = "syscon", "simple-mfd";
-+ compatible = "simple-bus";
- reg = <0x1800c100 0x1a4>;
-+ ranges;
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-
-- pinctrl {
-+ pin-controller@1c0 {
- compatible = "brcm,bcm4708-pinmux";
-- offset = <0xc0>;
-+ reg = <0x1c0 0x24>;
-+ reg-names = "cru_gpio_control";
-
- spi-pins {
- function = "spi";
---
-2.33.1
-
drm-amdgpu-revert-add-autodump-debugfs-node-for-gpu-reset-v8.patch
drm-amd-display-revert-directly-retrain-link-from-debugfs.patch
revert-drm-i915-gt-propagate-change-in-error-status-to-children-on-unhold.patch
-revert-dt-bindings-pinctrl-bcm4708-pinmux-rework-binding-to-use-syscon.patch
+alsa-usb-audio-add-schiit-hel-device-to-mixer-map-quirk-table.patch
+alsa-usb-audio-add-audient-id14-to-mixer-map-quirk-table.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
