Unverified Commit 75c324d5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: dt-bindings: Rework audio-graph-port schema" from Rob... 

Merge series "ASoC: dt-bindings: Rework audio-graph-port schema" from Rob Herring <robh@kernel.org>:

This series refactors the audio-graph-port.yaml schema moving the
'port' node out of the schema and updating to use graph.yaml schema.
This allows users to define what each 'port' node is like other graph
binding users.

v2:
- Rebase on ASoC tree

Rob

Cc: alsa-devel@alsa-project.org
Cc: linux-tegra@vger.kernel.org
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Lubomir Rintel <lkundrak@v3.sk>
Cc: Mark Brown <broonie@kernel.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Sameer Pujar <spujar@nvidia.com>
Cc: Thierry Reding <thierry.reding@gmail.com>

Rob Herring (3):
  ASoC: dt-bindings: Move port/ports properties out of
    audio-graph-port.yaml
  ASoC: dt-bindings: Use OF graph schema
  ASoC: dt-bindings: socionext: Use audio-graph-port schema

 .../bindings/sound/audio-graph-port.yaml      | 104 ++++++++----------
 .../bindings/sound/marvell,mmp-sspa.yaml      |   6 +-
 .../bindings/sound/nvidia,tegra186-dspk.yaml  |  11 +-
 .../sound/nvidia,tegra210-admaif.yaml         |  11 +-
 .../bindings/sound/nvidia,tegra210-ahub.yaml  |  11 +-
 .../bindings/sound/nvidia,tegra210-dmic.yaml  |  11 +-
 .../bindings/sound/nvidia,tegra210-i2s.yaml   |  11 +-
 .../bindings/sound/renesas,rsnd.yaml          |   5 +-
 .../sound/socionext,uniphier-aio.yaml         |   8 +-
 .../sound/socionext,uniphier-evea.yaml        |   8 +-
 10 files changed, 89 insertions(+), 97 deletions(-)

--
2.27.0
parents 73935e93 f1321c97

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/marvell,mmp-sspa.yaml

+2 −4
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ title: Marvel SSPA Digital Audio Interface Bindings 
maintainers:

  - Lubomir Rintel <lkundrak@v3.sk>



allOf:

  - $ref: audio-graph-port.yaml#



properties:

  $nodename:

    pattern: "^audio-controller(@.*)?$"
@@ -54,7 +51,8 @@ properties: 
      - const: rx



  port:

    type: object

    $ref: audio-graph-port.yaml#

    unevaluatedProperties: false



    properties:

      endpoint:

Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml

+6 −5
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ maintainers: 
  - Jon Hunter <jonathanh@nvidia.com>

  - Sameer Pujar <spujar@nvidia.com>



allOf:

  - $ref: audio-graph-port.yaml#



properties:

  $nodename:

    pattern: "^dspk@[0-9a-f]*$"
@@ -59,14 +56,18 @@ properties: 
      available instances on a Tegra SoC.



  ports:

    type: object

    $ref: /schemas/graph.yaml#/properties/ports

    properties:

      port@0:

        $ref: audio-graph-port.yaml#

        unevaluatedProperties: false

        description: |

          DSPK ACIF (Audio Client Interface) port connected to the

          corresponding AHUB (Audio Hub) ACIF port.



      port@1:

        $ref: audio-graph-port.yaml#

        unevaluatedProperties: false

        description: |

          DSPK DAP (Digital Audio Port) interface which can be connected

          to external audio codec for playback.
@@ -80,7 +81,7 @@ required: 
  - assigned-clock-parents

  - sound-name-prefix



unevaluatedProperties: false

additionalProperties: false



examples:

  - |

Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml

+7 −4
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ maintainers: 
  - Jon Hunter <jonathanh@nvidia.com>

  - Sameer Pujar <spujar@nvidia.com>



allOf:

  - $ref: audio-graph-port.yaml#



properties:

  $nodename:

    pattern: "^admaif@[0-9a-f]*$"
@@ -41,6 +38,7 @@ properties: 
  dma-names: true



  ports:

    $ref: /schemas/graph.yaml#/properties/ports

    description: |

      Contains list of ACIF (Audio CIF) port nodes for ADMAIF channels.

      The number of port nodes depends on the number of ADMAIF channels
@@ -48,6 +46,11 @@ properties: 
      in AHUB (Audio Hub). Each port is capable of data transfers in

      both directions.



    patternProperties:

      '^port@[0-9]':

        $ref: audio-graph-port.yaml#

        unevaluatedProperties: false



if:

  properties:

    compatible:
@@ -92,7 +95,7 @@ required: 
  - dmas

  - dma-names



unevaluatedProperties: false

additionalProperties: false



examples:

  - |

Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml

+7 −4
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ maintainers: 
  - Jon Hunter <jonathanh@nvidia.com>

  - Sameer Pujar <spujar@nvidia.com>



allOf:

  - $ref: audio-graph-port.yaml#



properties:

  $nodename:

    pattern: "^ahub@[0-9a-f]*$"
@@ -60,12 +57,18 @@ properties: 
  ranges: true



  ports:

    $ref: /schemas/graph.yaml#/properties/ports

    description: |

      Contains list of ACIF (Audio CIF) port nodes for AHUB (Audio Hub).

      These are connected to ACIF interfaces of AHUB clients. Thus the

      number of port nodes depend on the number of clients that AHUB may

      have depending on the SoC revision.



    patternProperties:

      '^port@[0-9]':

        $ref: audio-graph-port.yaml#

        unevaluatedProperties: false



patternProperties:

  '^i2s@[0-9a-f]+$':

    type: object
@@ -93,7 +96,7 @@ required: 
  - "#size-cells"

  - ranges



unevaluatedProperties: false

additionalProperties: false



examples:

  - |