Commit 3ceff4ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "It's a relatively calm development cycle, but still lots of updates in
  the driver side like Intel SOF. Below are some highlights:

  ALSA / ASoC core:
   - A new kselftest for ALSA control API
   - PCM NO_REWINDS support
   - Potential race fixes around control removals
   - Unify x86 SG-buffer memory allocation code
   - Cleanups and race fixes for ASoC DPCM locking

  ASoC:
   - Refinements and cleanups around the delay() APIs
   - Wider use of dev_err_probe().
   - Continuing cleanups and improvements to the SOF code
   - Support for pin switches in simple-card derived cards
   - Support for AMD Renoir ACP, Asahi Kasei Microdevices AKM4375, Intel
     systems using NAU8825 and MAX98390, Mediatek MT8915, nVidia Tegra20
     S/PDIF, Qualcomm systems using ALC5682I-VS and Texas Instruments
     TLV320ADC3xxx

  HD-audio / USB-audio:
   - Fix deadlock at HD-audio codec unbinding
   - Fixes for Tegra194 HD-audio, new HDA support for CS35L41 codec
   - Quirks for Lenovo and HP machines, Gigabyte mobo, Bose device

  Misc:
   - Fix virmidi drain behavior

  Note that the merge of CS35L41 codec support is still half-baked, and
  at least one ACPI change is missing. Although this won't hinder the
  kernel build itself, we're going to catch up before RC1"

* tag 'sound-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (415 commits)
  ALSA: hda: intel-dsp-config: reorder the config table
  ALSA: hda: intel-dsp-config: add JasperLake support
  ALSA: hda: cs35l41: fix double free on error in probe()
  ALSA: hda: Fix dependencies of CS35L41 on SPI/I2C buses
  ALSA: hda: Fix dependency on ASoC cs35l41 codec
  ASoC: cs35l41: Add support for hibernate memory retention mode
  ASoC: cs35l41: Update handling of test key registers
  ALSA: intel_hdmi: Check for error num after setting mask
  ASoC: wcd9335: Keep a RX port value for each SLIM RX mux
  ASoC: amd: acp: acp-mach: Change default RT1019 amp dev id
  ALSA: virmidi: Remove duplicated code
  ALSA: seq: virmidi: Add a drain operation
  ASoC: topology: Fix typo
  ASoC: fsl_asrc: refine the check of available clock divider
  ASoC: Intel: bytcr_rt5640: Add support for external GPIO jack-detect
  ASoC: Intel: bytcr_rt5640: Support retrieving the codec IRQ from the AMCR0F28 ACPI dev
  ASoC: rt5640: Add support for boards with an external jack-detect GPIO
  ASoC: rt5640: Allow snd_soc_component_set_jack() to override the codec IRQ
  ASoC: rt5640: Change jack_work to a delayed_work
  ASoC: rt5640: Fix possible NULL pointer deref on resume
  ...
parents e1a7aa25 081c7370

Documentation/devicetree/bindings/sound/ak4375.yaml

0 → 100644
+57 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/ak4375.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: AK4375 DAC and headphones amplifier Device Tree Bindings



maintainers:

  - Vincent Knecht <vincent.knecht@mailoo.org>



properties:

  compatible:

    const: asahi-kasei,ak4375



  reg:

    maxItems: 1



  '#sound-dai-cells':

    const: 0



  avdd-supply:

    description: regulator phandle for the AVDD power supply.



  tvdd-supply:

    description: regulator phandle for the TVDD power supply.



  pdn-gpios:

    description: optional GPIO to set the PDN pin.



required:

  - compatible

  - reg

  - '#sound-dai-cells'

  - avdd-supply

  - tvdd-supply



additionalProperties: false



examples:

  - |

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

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      headphones: audio-codec@10 {

        compatible = "asahi-kasei,ak4375";

        reg = <0x10>;

        avdd-supply = <&reg_headphones_avdd>;

        tvdd-supply = <&pm8916_l6>;

        pdn-gpios = <&msmgpio 114 GPIO_ACTIVE_HIGH>;

        pinctrl-names = "default";

        pinctrl-0 = <&headphones_pdn_default>;

        #sound-dai-cells = <0>;

      };

    };

Documentation/devicetree/bindings/sound/amlogic,aiu.yaml

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Amlogic AIU audio output controller 
maintainers:

  - Jerome Brunet <jbrunet@baylibre.com>



allOf:

  - $ref: name-prefix.yaml#



properties:

  $nodename:

    pattern: "^audio-controller@.*"
@@ -65,6 +68,8 @@ properties: 
  resets:

    maxItems: 1



  sound-name-prefix: true



required:

  - "#sound-dai-cells"

  - compatible

Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Amlogic G12a Internal DAC Control Glue 
maintainers:

  - Jerome Brunet <jbrunet@baylibre.com>



allOf:

  - $ref: name-prefix.yaml#



properties:

  $nodename:

    pattern: "^audio-controller@.*"
@@ -31,6 +34,8 @@ properties: 
  resets:

    maxItems: 1



  sound-name-prefix: true



required:

  - "#sound-dai-cells"

  - compatible

Documentation/devicetree/bindings/sound/amlogic,t9015.yaml

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Amlogic T9015 Internal Audio DAC 
maintainers:

  - Jerome Brunet <jbrunet@baylibre.com>



allOf:

  - $ref: name-prefix.yaml#



properties:

  $nodename:

    pattern: "^audio-controller@.*"
@@ -38,6 +41,8 @@ properties: 
    description:

      Analogue power supply.



  sound-name-prefix: true



required:

  - "#sound-dai-cells"

  - compatible

Documentation/devicetree/bindings/sound/audio-graph-port.yaml

+7 −2
Original line number Diff line number Diff line
@@ -42,10 +42,15 @@ patternProperties: 
        $ref: /schemas/types.yaml#/definitions/flag

      frame-master:

        description: Indicates dai-link frame master.

        $ref: /schemas/types.yaml#/definitions/phandle

        oneOf:

          - $ref: /schemas/types.yaml#/definitions/flag

          - $ref: /schemas/types.yaml#/definitions/phandle

      bitclock-master:

        description: Indicates dai-link bit clock master

        $ref: /schemas/types.yaml#/definitions/phandle

        oneOf:

          - $ref: /schemas/types.yaml#/definitions/flag

          - $ref: /schemas/types.yaml#/definitions/phandle



      dai-format:

        description: audio format.

        items: