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

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

Pull sound updates from Takashi Iwai:
 "It's been relatively calm for a new era; majority of changes are for
  ASoC, mostly device-specific changes, while there are a bit of
  cleanups in core stuff. A few SPI API and regmap updates are included
  to be used by sound drivers, too.

  Core:
   - A few trivial cleanups about __free() and runtime PM macros
   - Convert to new snd_seq_bus binding

  ASoC:
   - Generic SDCA support for reporting jack events
   - Continuing platform support, cleanup and feature improvements for
     AMD, Intel, Qualcomm and SOF code
   - Platform description improvements for the Cirrus drivers
   - Support for NXP i.MX952, Realtek RT1320 and RT5575, and Sophogo
     CV1800B

  HD- and USB-audio:
   - Many quirks as usual"

* tag 'sound-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits)
  ALSA: usb-audio: Add DSD support for iBasso DC04U
  ALSA: mixer: oss: Add card disconnect checkpoints
  ASoC: SOF: ipc4-control: Set correct error code in refresh_bytes_control
  ASoC: SOF: Intel: select CONFIG_SND_HDA_EXT_CORE from SND_SOC_SOF_HDA_COMMON
  ALSA: usb-audio: Add iface reset and delay quirk for AB13X USB Audio
  ASoC: amd: maintainer information
  ALSA: ctxfi: Add quirk for SE-300PCIE variant (160b:0102)
  ALSA: hda/generic: fix typos in comments
  ALSA: hda/realtek - Enable mute LEDs on HP ENVY x360 15-es0xxx
  ALSA: hda/conexant: Add quirk for HP ZBook Studio G4
  ASoC: fsl_asrc_dma: allocate memory from dma device
  ASoC: fsl_asrc: Add support for i.MX952 platform
  ASoC: fsl_asrc_m2m: Add option to start ASRC before DMA device for M2M
  ASoC: dt-bindings: fsl,imx-asrc: Add support for i.MX952 platform
  ALSA: oss: delete self assignment
  ASoC: rockchip: spdif: Convert to FIELD_PREP
  ASoC: rockchip: spdif: Fill IEC958 CS info per params
  ASoC: rockchip: spdif: Add support for format S32_LE
  ASoC: rockchip: spdif: Add support for set mclk rate
  ASoC: rockchip: spdif: Swap PCM and DAI component registration order
  ...
parents 0d6dd473 dd03dd60

Documentation/devicetree/bindings/goldfish/audio.txt

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
Android Goldfish Audio



Android goldfish audio device generated by android emulator.



Required properties:



- compatible : should contain "google,goldfish-audio" to match emulator

- reg        : <registers mapping>

- interrupts : <interrupt mapping>



Example:



	goldfish_audio@9030000 {

		compatible = "google,goldfish-audio";

		reg = <0x9030000 0x100>;

		interrupts = <0x4>;

	};

Documentation/devicetree/bindings/sound/awinic,aw87390.yaml

+29 −5
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@ description: 
  sound quallity, which is a new high efficiency, low

  noise, constant large volume, 6th Smart K audio amplifier.



allOf:

  - $ref: dai-common.yaml#



properties:

  compatible:

    const: awinic,aw87390

    oneOf:

      - enum:

          - awinic,aw87390

      - items:

          - enum:

              - anbernic,rgds-amp

          - const: awinic,aw87391



  reg:

    maxItems: 1
@@ -40,10 +43,31 @@ required: 
  - compatible

  - reg

  - "#sound-dai-cells"

  - awinic,audio-channel



unevaluatedProperties: false



allOf:

  - $ref: dai-common.yaml#

  - if:

      properties:

        compatible:

          contains:

            enum:

              - awinic,aw87390

    then:

      required:

        - awinic,audio-channel



  - if:

      properties:

        compatible:

          contains:

            enum:

              - anbernic,rgds-amp

    then:

      properties:

        vdd-supply: true



examples:

  - |

    i2c {

Documentation/devicetree/bindings/sound/awinic,aw88395.yaml

+13 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ properties: 
  reset-gpios:

    maxItems: 1



  dvdd-supply: true



  awinic,audio-channel:

    description:

      It is used to distinguish multiple PA devices, so that different
@@ -65,6 +67,17 @@ allOf: 
    then:

      properties:

        reset-gpios: false

  - if:

      properties:

        compatible:

          contains:

            const: awinic,aw88261

    then:

      required:

        - dvdd-supply

    else:

      properties:

        dvdd-supply: false



unevaluatedProperties: false

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml

+66 −5
Original line number Diff line number Diff line
@@ -40,11 +40,33 @@ properties: 
  tdm-slots:

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

    description:

      number of channels over one serializer

      the property is ignored in DIT mode

      Number of channels over one serializer. This property

      specifies the TX playback TDM slot count, along with default RX slot count

      if tdm-slots-rx is not specified.

      The property is ignored in DIT mode.

    minimum: 2

    maximum: 32



  tdm-slots-rx:

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

    description:

      Number of RX capture channels over one serializer. If specified,

      allows independent RX TDM slot count separate from TX. Requires

      ti,async-mode to be enabled for independent TX/RX clock rates.

      The property is ignored in DIT mode.

    minimum: 2

    maximum: 32



  ti,async-mode:

    description:

      Specify to allow independent TX & RX clocking,

      to enable audio playback & record with different sampling rate,

      and different number of bits per frame.

      if property is omitted, TX and RX will share same bit clock and frame clock signals,

      thus RX need to use same bits per frame and sampling rate as TX in synchronous mode.

      the property is ignored in DIT mode (as DIT is TX-only)

    type: boolean



  serial-dir:

    description:

      A list of serializer configuration
@@ -125,7 +147,21 @@ properties: 


  auxclk-fs-ratio:

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

    description: ratio of AUCLK and FS rate if applicable

    description:

      Ratio of AUCLK and FS rate if applicable. This property specifies

      the TX ratio, along with default RX ratio if auxclk-fs-ratio-rx

      is not specified.

      When not specified, the inputted system clock frequency via set_sysclk

      callback by the machine driver is used for divider calculation.



  auxclk-fs-ratio-rx:

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

    description:

      Ratio of AUCLK and FS rate for RX. If specified, allows

      for a different RX ratio. Requires ti,async-mode to be

      enabled when the ratio differs from auxclk-fs-ratio.

      When not specified, it defaults to the value of auxclk-fs-ratio.

      The property is ignored in DIT mode.



  gpio-controller: true
@@ -170,14 +206,38 @@ allOf: 
  - $ref: dai-common.yaml#

  - if:

      properties:

        opmode:

        op-mode:

          enum:

            - 0



    then:

      required:

        - tdm-slots



  - if:

      properties:

        op-mode:

          const: 1

    then:

      properties:

        tdm-slots: false

        tdm-slots-rx: false

        ti,async-mode: false

        auxclk-fs-ratio-rx: false



  - if:

      required:

        - tdm-slots-rx

    then:

      required:

        - ti,async-mode



  - if:

      required:

        - auxclk-fs-ratio-rx

    then:

      required:

        - ti,async-mode



unevaluatedProperties: false



examples:
@@ -190,6 +250,7 @@ examples: 
      interrupt-names = "tx", "rx";

      op-mode = <0>;		/* MCASP_IIS_MODE */

      tdm-slots = <2>;

      ti,async-mode;

      dmas = <&main_udmap 0xc400>, <&main_udmap 0x4400>;

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

      serial-dir = <

Documentation/devicetree/bindings/sound/everest,es8389.yaml

+12 −0
Original line number Diff line number Diff line
@@ -30,10 +30,20 @@ properties: 
  "#sound-dai-cells":

    const: 0



  vdda-supply:

    description:

      Analogue power supply.



  vddd-supply:

    description:

      Interface power supply.



required:

  - compatible

  - reg

  - "#sound-dai-cells"

  - vddd-supply

  - vdda-supply



additionalProperties: false
@@ -46,5 +56,7 @@ examples: 
        compatible = "everest,es8389";

        reg = <0x10>;

        #sound-dai-cells = <0>;

        vddd-supply = <&vdd3v3>;

        vdda-supply = <&vdd3v3>;

      };

    };