Commit b71428d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "No surprises in this development cycle, and most of work is about the
  fixes and the improvements of the existing code, while a new LED
  control layer and a few new drivers have been introduced.

  Here are some highlights:

  Core:
   - A common mute-LED framework was introduced. It is used by HD-audio
     for now, more adaption will follow later. The former "Mic Mute-LED
     Mode" mixer control has been replaced with the corresponding sysfs
     now.
   - User-control management was changed to count consumed bytes instead
     of capping by number of elements; this will allow more controls in
     the normal usage pattern while avoiding the possible memory
     exhaustion DoS

  ASoC:
   - Continued refactoring and cleanups in ASoC core and generic card
     drivers
   - Wide range of small cppcheck and warning fixes
   - New drivers for Freescale i.MX DMA over rpmsg, Mediatek MT6358
     accessory detection, and Realtek RT1019, RT1316, RT711 and RT715

  USB-audio:
   - Continued improvements and fixes of the implicit feedback mode,
     including better support for Pioneer and Roland/BOSS devices

  HD-audio:
   - Default back to non-buffer preallocation on x86
   - Cirrus codec improvements, more quirks for Realtek codecs

  Others:
   - New virtio sound driver
   - FireWire Bebob updates"

* tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (587 commits)
  ALSA: hda/conexant: Re-order CX5066 quirk table entries
  ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices
  ALSA: hda/realtek: Re-order ALC662 quirk table entries
  ALSA: hda/realtek: Re-order remaining ALC269 quirk table entries
  ALSA: hda/realtek: Re-order ALC269 Lenovo quirk table entries
  ALSA: hda/realtek: Re-order ALC269 Sony quirk table entries
  ALSA: hda/realtek: Re-order ALC269 ASUS quirk table entries
  ALSA: hda/realtek: Re-order ALC269 Dell quirk table entries
  ALSA: hda/realtek: Re-order ALC269 Acer quirk table entries
  ALSA: hda/realtek: Re-order ALC269 HP quirk table entries
  ALSA: hda/realtek: Re-order ALC882 Clevo quirk table entries
  ALSA: hda/realtek: Re-order ALC882 Sony quirk table entries
  ALSA: hda/realtek: Re-order ALC882 Acer quirk table entries
  ALSA: usb-audio: Remove redundant assignment to len
  ALSA: hda/realtek: Add quirk for Intel Clevo PCx0Dx
  ALSA: virtio: fix kernel-doc
  ALSA: hda/cirrus: Use CS8409 filter to fix abnormal sounds on Bullseye
  ALSA: hda/cirrus: Set Initial DMIC volume for Bullseye to -26 dB
  ALSA: sb: Fix two use after free in snd_sb_qsound_build
  ALSA: emu8000: Fix a use after free in snd_emu8000_create_mixer
  ...
parents 95275402 2e6a7312

Documentation/devicetree/bindings/sound/ak5558.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ This device supports I2C mode only. 


Required properties:



- compatible : "asahi-kasei,ak5558"

- compatible : "asahi-kasei,ak5558" or "asahi-kasei,ak5552".

- reg : The I2C address of the device.



Optional properties:

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

+46 −58
Original line number Diff line number Diff line
@@ -11,13 +11,10 @@ maintainers: 


select: false



allOf:

  - $ref: /schemas/graph.yaml#/$defs/port-base



properties:

  port:

    description: single OF-Graph subnode

    type: object

    properties:

      reg:

        maxItems: 1

  prefix:

    description: "device name prefix"

    $ref: /schemas/types.yaml#/definitions/string
@@ -29,10 +26,8 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

patternProperties:

  "^endpoint(@[0-9a-f]+)?":

        type: object

    $ref: /schemas/graph.yaml#/$defs/endpoint-base

    properties:

          remote-endpoint:

            maxItems: 1

      mclk-fs:

        description: |

          Multiplication factor between stream rate and codec mclk.
@@ -71,11 +66,4 @@ properties: 
        description: CPU to Codec rate channels.

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



  ports:

    description: multi OF-Graph subnode

    type: object

    patternProperties:

      "^port(@[0-9a-f]+)?":

        $ref: "#/properties/port"



additionalProperties: true

Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml

0 → 100644
+108 −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/fsl,rpmsg.yaml#

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



title: NXP Audio RPMSG CPU DAI Controller



maintainers:

  - Shengjiu Wang <shengjiu.wang@nxp.com>



description: |

  fsl_rpmsg is a virtual audio device. Mapping to real hardware devices

  are SAI, DMA controlled by Cortex M core. What we see from Linux

  side is a device which provides audio service by rpmsg channel.



properties:

  compatible:

    enum:

      - fsl,imx7ulp-rpmsg-audio

      - fsl,imx8mn-rpmsg-audio

      - fsl,imx8mm-rpmsg-audio

      - fsl,imx8mp-rpmsg-audio



  model:

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

    description: User specified audio sound card name



  clocks:

    items:

      - description: Peripheral clock for register access

      - description: Master clock

      - description: DMA clock for DMA register access

      - description: Parent clock for multiple of 8kHz sample rates

      - description: Parent clock for multiple of 11kHz sample rates



  clock-names:

    items:

      - const: ipg

      - const: mclk

      - const: dma

      - const: pll8k

      - const: pll11k



  power-domains:

    description:

      List of phandle and PM domain specifier as documented in

      Documentation/devicetree/bindings/power/power_domain.txt

    maxItems: 1



  memory-region:

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

    description:

      phandle to a node describing reserved memory (System RAM memory)

      The M core can't access all the DDR memory space on some platform,

      So reserved a specific memory for dma buffer which M core can

      access.

      (see bindings/reserved-memory/reserved-memory.txt)



  audio-codec:

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

    description: The phandle to a node of audio codec



  audio-routing:

    $ref: /schemas/types.yaml#/definitions/non-unique-string-array

    description: |

      A list of the connections between audio components. Each entry is a

      pair of strings, the first being the connection's sink, the second

      being the connection's source.



  fsl,enable-lpa:

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

    description: enable low power audio path.



  fsl,rpmsg-out:

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

    description: |

      This is a boolean property. If present, the transmitting function

      will be enabled.



  fsl,rpmsg-in:

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

    description: |

      This is a boolean property. If present, the receiving function

      will be enabled.



required:

  - compatible

  - model



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/imx8mn-clock.h>



    rpmsg_audio: rpmsg_audio {

        compatible = "fsl,imx8mn-rpmsg-audio";

        model = "wm8524-audio";

        fsl,enable-lpa;

        fsl,rpmsg-out;

        clocks = <&clk IMX8MN_CLK_SAI3_IPG>,

                 <&clk IMX8MN_CLK_SAI3_ROOT>,

                 <&clk IMX8MN_CLK_SDMA3_ROOT>,

                 <&clk IMX8MN_AUDIO_PLL1_OUT>,

                 <&clk IMX8MN_AUDIO_PLL2_OUT>;

        clock-names = "ipg", "mclk", "dma", "pll8k", "pll11k";

    };

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ The compatible list for this generic sound card currently: 


 "fsl,imx-audio-si476x"



 "fsl,imx-audio-wm8958"



Required properties:



  - compatible		: Contains one of entries in the compatible list.

Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml

+1 −1
Original line number Diff line number Diff line
@@ -81,6 +81,6 @@ examples: 
         interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;

         clock-names = "osc", "apb_clk";

         clocks = <&scmi_clk KEEM_BAY_PSS_AUX_I2S3>, <&scmi_clk KEEM_BAY_PSS_I2S3>;

         dmas = <&axi_dma0 29 &axi_dma0 33>;

         dmas = <&axi_dma0 29>, <&axi_dma0 33>;

         dma-names = "tx", "rx";

     };