Commit 377773dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of lots of small changes, almost all device-specific:

   - A series of fixes for ASoC Qualcomm stuff

   - Various fixes for Cirrus ASoC and HD-audio codecs

   - A few AMD ASoC quirks and usual HD-audio quirks

   - Other misc fixes, including a long-time regression in USB-audio"

* tag 'sound-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (39 commits)
  ASoC: cs35l56: Patch CS35L56_IRQ1_MASK_18 to the default value
  ASoC: meson: axg-fifo: fix irq scheduling issue with PREEMPT_RT
  MAINTAINERS: Update Cirrus Logic parts to linux-sound mailing list
  ASoC: dt-bindings: qcom,wcd939x: Correct reset GPIO polarity in example
  ASoC: dt-bindings: qcom,wcd938x: Correct reset GPIO polarity in example
  ASoC: dt-bindings: qcom,wcd934x: Correct reset GPIO polarity in example
  ASoC: dt-bindings: qcom,wcd937x: Correct reset GPIO polarity in example
  ASoC: amd: yc: Add quirk entry for OMEN by HP Gaming Laptop 16-n0xxx
  ASoC: codecs: ES8326: button detect issue
  ASoC: amd: yc: Support mic on Lenovo Thinkpad E14 Gen 6
  ALSA: usb-audio: Re-add ScratchAmp quirk entries
  ALSA: hda/realtek: Add Framework Laptop 13 (Intel Core Ultra) to quirks
  ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
  ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
  ASoC: cs35l56: Handle OTP read latency over SoundWire
  ASoC: codecs: lpass-macro: fix missing codec version
  ALSA: line6: Fix racy access to midibuf
  ASoC: cs-amp-lib: Fix NULL pointer crash if efi.get_variable is NULL
  ASoC: cs35l56: Stop creating ALSA controls for firmware coefficients
  ASoC: wm_adsp: Add control_add callback and export wm_adsp_control_add()
  ...
parents 2124d84d d3e82ced

Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml

+2 −1
Original line number Diff line number Diff line
@@ -199,10 +199,11 @@ additionalProperties: false 


examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    codec@1,0{

        compatible = "slim217,250";

        reg = <1 0>;

        reset-gpios = <&tlmm 64 0>;

        reset-gpios = <&tlmm 64 GPIO_ACTIVE_LOW>;

        slim-ifc-dev = <&wcd9340_ifd>;

        #sound-dai-cells = <1>;

        interrupt-parent = <&tlmm>;

Documentation/devicetree/bindings/sound/qcom,wcd937x.yaml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ examples: 
        pinctrl-names = "default", "sleep";

        pinctrl-0 = <&wcd_reset_n>;

        pinctrl-1 = <&wcd_reset_n_sleep>;

        reset-gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>;

        reset-gpios = <&tlmm 83 GPIO_ACTIVE_LOW>;

        vdd-buck-supply = <&vreg_l17b_1p8>;

        vdd-rxtx-supply = <&vreg_l18b_1p8>;

        vdd-px-supply = <&vreg_l18b_1p8>;

Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml

+2 −1
Original line number Diff line number Diff line
@@ -34,9 +34,10 @@ unevaluatedProperties: false 


examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    codec {

        compatible = "qcom,wcd9380-codec";

        reset-gpios = <&tlmm 32 0>;

        reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;

        #sound-dai-cells = <1>;

        qcom,tx-device = <&wcd938x_tx>;

        qcom,rx-device = <&wcd938x_rx>;

Documentation/devicetree/bindings/sound/qcom,wcd939x.yaml

+2 −2
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ unevaluatedProperties: false 


examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/gpio/gpio.h>

    codec {

        compatible = "qcom,wcd9390-codec";

        reset-gpios = <&tlmm 32 IRQ_TYPE_NONE>;

        reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;

        #sound-dai-cells = <1>;

        qcom,tx-device = <&wcd939x_tx>;

        qcom,rx-device = <&wcd939x_rx>;

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5306,7 +5306,7 @@ F: drivers/media/cec/i2c/ch7322.c 
CIRRUS LOGIC AUDIO CODEC DRIVERS

M:	David Rhodes <david.rhodes@cirrus.com>

M:	Richard Fitzgerald <rf@opensource.cirrus.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	linux-sound@vger.kernel.org

L:	patches@opensource.cirrus.com

S:	Maintained

F:	Documentation/devicetree/bindings/sound/cirrus,cs*
@@ -5375,7 +5375,7 @@ F: sound/soc/codecs/lochnagar-sc.c 
CIRRUS LOGIC MADERA CODEC DRIVERS

M:	Charles Keepax <ckeepax@opensource.cirrus.com>

M:	Richard Fitzgerald <rf@opensource.cirrus.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	linux-sound@vger.kernel.org

L:	patches@opensource.cirrus.com

S:	Supported

W:	https://github.com/CirrusLogic/linux-drivers/wiki