Commit 40037e4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "It's been a fairly calm development cycle. There are a few last-minute
  ALSA core fixes, most notably for covering PCM ioctl races, but the
  most of rest are device-specific changes.

  Below are some highlights:

  ALSA core:

   - Fixes for PCM ioctl races that may lead to UAF

   - Fix for oversized allocations in PCM OSS layer

  ASoC:

   - Start of moving SoF to support multiple IPC mechanisms

   - Use of NHLT ACPI table to reduce the amount of quirking required
     for Intel systems

   - Preliminary works 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

  HD-audio:

   - Driver re-binding fix for HD-audio

   - Updates for Intel ADL and Tegra234, various platform quirks for
     Dell, HP, Lenovo, ASUS, Samsung and Clevo machines

  USB-audio:

   - Quirk updates for Scarlett2, RODE, Corsair devices"

* tag 'sound-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (486 commits)
  ALSA: hda/realtek: Add alc256-samsung-headphone fixup
  ALSA: pci: fix reading of swapped values from pcmreg in AC97 codec
  ALSA: pcm: Add stream lock during PCM reset ioctl operations
  ALSA: pcm: Fix races among concurrent prealloc proc writes
  ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls
  ALSA: pcm: Fix races among concurrent read/write and buffer changes
  ALSA: pcm: Fix races among concurrent hw_params and hw_free calls
  ASoC: atmel: mchp-pdmc: print the correct property name
  MAINTAINERS: Add Shengjiu to maintainer list of sound/soc/fsl
  ASoC: SOF: Add a new dai_get_clk topology IPC op
  ASoC: SOF: topology: Add ops for setting up and tearing down pipelines
  ASoC: SOF: expose sof_route_setup()
  ASoC: SOF: Add dai_link_fixup PCM op for IPC3
  ASoC: SOF: Add trigger PCM op for IPC3
  ASoC: SOF: Define hw_params PCM op for IPC3
  ASoC: SOF: Introduce IPC3 PCM hw_free op
  ASoC: SOF: pcm: expose the sof_pcm_setup_connected_widgets() function
  ASoC: SOF: Introduce IPC-specific PCM ops
  ASoC: SOF: Add bytes_ext control IPC ops for IPC3
  ASoC: SOF: Add bytes_get/put control IPC ops for IPC3
  ...
parents 182966e1 ef248d9b

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>;

};