Unverified Commit 358c7c61 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus

parents a72ff08f a6b675a8

Documentation/devicetree/bindings/dsp/fsl,dsp.yaml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ properties: 
  compatible:

    enum:

      - fsl,imx8qxp-dsp

      - fsl,imx8qm-dsp

      - fsl,imx8mp-dsp



  reg:

    description: Should contain register location and length

Documentation/devicetree/bindings/sound/da7213.txt

+6 −2
Original line number Diff line number Diff line 
Dialog Semiconductor DA7213 Audio Codec bindings

Dialog Semiconductor DA7212/DA7213 Audio Codec bindings



======



Required properties:

- compatible : Should be "dlg,da7213"

- compatible : Should be "dlg,da7212" or "dlg,da7213"

- reg: Specifies the I2C slave address



Optional properties:
@@ -21,6 +21,10 @@ Optional properties: 
- dlg,dmic-clkrate : DMIC clock frequency (Hz).

	[<1500000>, <3000000>]



 - VDDA-supply : Regulator phandle for Analogue power supply

 - VDDMIC-supply : Regulator phandle for Mic Bias

 - VDDIO-supply : Regulator phandle for I/O power supply



======



Example:

Documentation/devicetree/bindings/sound/fsl,asrc.txt

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ Optional properties: 
			  will be in use as default. Otherwise, the big endian

			  mode will be in use for all the device registers.



   - fsl,asrc-format	: Defines a mutual sample format used by DPCM Back

			  Ends, which can replace the fsl,asrc-width.

			  The value is 2 (S16_LE), or 6 (S24_LE).



Example:



asrc: asrc@2034000 {

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

0 → 100644
+101 −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,easrc.yaml#

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



title: NXP Asynchronous Sample Rate Converter (ASRC) Controller



maintainers:

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



properties:

  $nodename:

    pattern: "^easrc@.*"



  compatible:

    const: fsl,imx8mn-easrc



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: Peripheral clock



  clock-names:

    items:

      - const: mem



  dmas:

    maxItems: 8



  dma-names:

    items:

      - const: ctx0_rx

      - const: ctx0_tx

      - const: ctx1_rx

      - const: ctx1_tx

      - const: ctx2_rx

      - const: ctx2_tx

      - const: ctx3_rx

      - const: ctx3_tx



  firmware-name:

    allOf:

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

      - const: imx/easrc/easrc-imx8mn.bin

    description: The coefficient table for the filters



  fsl,asrc-rate:

    allOf:

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

      - minimum: 8000

      - maximum: 192000

    description: Defines a mutual sample rate used by DPCM Back Ends



  fsl,asrc-format:

    allOf:

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

      - enum: [2, 6, 10, 32, 36]

        default: 2

    description:

      Defines a mutual sample format used by DPCM Back Ends



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names

  - dmas

  - dma-names

  - firmware-name

  - fsl,asrc-rate

  - fsl,asrc-format



examples:

  - |

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



    easrc: easrc@300c0000 {

           compatible = "fsl,imx8mn-easrc";

           reg = <0x0 0x300c0000 0x0 0x10000>;

           interrupts = <0x0 122 0x4>;

           clocks = <&clk IMX8MN_CLK_ASRC_ROOT>;

           clock-names = "mem";

           dmas = <&sdma2 16 23 0> , <&sdma2 17 23 0>,

                  <&sdma2 18 23 0> , <&sdma2 19 23 0>,

                  <&sdma2 20 23 0> , <&sdma2 21 23 0>,

                  <&sdma2 22 23 0> , <&sdma2 23 23 0>;

           dma-names = "ctx0_rx", "ctx0_tx",

                       "ctx1_rx", "ctx1_tx",

                       "ctx2_rx", "ctx2_tx",

                       "ctx3_rx", "ctx3_tx";

           firmware-name = "imx/easrc/easrc-imx8mn.bin";

           fsl,asrc-rate  = <8000>;

           fsl,asrc-format = <2>;

    };

Documentation/devicetree/bindings/sound/fsl,esai.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
			  "fsl,imx35-esai",

			  "fsl,vf610-esai",

			  "fsl,imx6ull-esai",

			  "fsl,imx8qm-esai",



  - reg			: Offset and length of the register set for the device.