Commit 646b907e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v5.18' of... 

Merge tag 'asoc-v5.18' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.18

Quite a quiet release for ASoC, lots of work on drivers and platforms
but nothing too groundbreaking but not much on the core itself:

 - Start of moving SoF to support multiple IPC mechanisms.
 - Use of NHLT ACPI table to reduce the amount of quirking required for
   Intel systems.
 - Some building blocks for use in forthcoming Intel AVS driver for
   legacy Intel DSP firmwares.
 - Support for AMD PDM, Atmel PDMC, Awinic AW8738, i.MX cards with
   TLV320AIC31xx, Intel machines with CS35L41 and ESSX8336, Mediatek
   MT8181 wideband bluetooth, nVidia Tegra234, Qualcomm SC7280, Renesas
   RZ/V2L, Texas Instruments TAS585M
parents a6d4b685 49a24e9d

Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.yaml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
      - const: nvidia,tegra210-aconnect

      - items:

          - enum:

              - nvidia,tegra234-aconnect

              - nvidia,tegra186-aconnect

              - nvidia,tegra194-aconnect

          - const: nvidia,tegra210-aconnect

Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ properties: 
          - nvidia,tegra210-adma

          - nvidia,tegra186-adma

      - items:

          - const: nvidia,tegra194-adma

          - enum:

              - nvidia,tegra234-adma

              - nvidia,tegra194-adma

          - const: nvidia,tegra186-adma



  reg:

Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ properties: 
              - enum:

                  - nvidia,tegra186-agic

                  - nvidia,tegra194-agic

                  - nvidia,tegra234-agic

              - const: nvidia,tegra210-agic



  interrupt-controller: true

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ properties: 
          - const: allwinner,sun50i-a64-i2s

          - const: allwinner,sun8i-h3-i2s

      - const: allwinner,sun50i-h6-i2s

      - const: allwinner,sun50i-r329-i2s

      - items:

          - const: allwinner,sun20i-d1-i2s

          - const: allwinner,sun50i-r329-i2s



  reg:

    maxItems: 1
@@ -67,6 +71,7 @@ allOf: 
              - allwinner,sun8i-h3-i2s

              - allwinner,sun50i-a64-codec-i2s

              - allwinner,sun50i-h6-i2s

              - allwinner,sun50i-r329-i2s



    then:

      required:

Documentation/devicetree/bindings/sound/arndale.txt

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
Audio Binding for Arndale boards



Required properties:

- compatible : Can be one of the following:

		"samsung,arndale-rt5631",

		"samsung,arndale-wm1811"



- samsung,audio-cpu: The phandle of the Samsung I2S controller

- samsung,audio-codec: The phandle of the audio codec



Optional:

- samsung,model: The name of the sound-card



Arndale Boards has many audio daughter cards, one of them is

rt5631/alc5631. Below example shows audio bindings for rt5631/

alc5631 based codec.



Example:



sound {

		compatible = "samsung,arndale-rt5631";



		samsung,audio-cpu = <&i2s0>

		samsung,audio-codec = <&rt5631>;

};