Unverified Commit ffc9841d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/for-5.13' into asoc-next

parents d143a69f 25c4a9b6
Loading
Loading
Loading
Loading
+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:
+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
+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";
    };
+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.
+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";
     };
Loading