Commit d3e82ced authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.11-rc2' of... 

Merge tag 'asoc-fix-v6.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.11

Quite a lot of fixes have come in since the merge window, there's some
repetitive fixes over the Qualcomm drivers increasing the patch count,
along with a large batch of fixes from Cirrus.  We also have some quirks
and some individual fixes.
parents 03898691 72776774

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