Unverified Commit 9c1e0439 authored by Rob Herring's avatar Rob Herring Committed by Mark Brown
Browse files

ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml 



Users of the audio-graph-port schema need to define how many ports
and what each port is, so they need to define 'ports' and/or 'port'
anyways. Let's drop 'ports' and 'port' from the schema and adjust users
to reference audio-graph-port.yaml from a port property.

Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Lubomir Rintel <lkundrak@v3.sk>
Cc: Sameer Pujar <spujar@nvidia.com>
Cc: alsa-devel@alsa-project.org
Cc: linux-tegra@vger.kernel.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210331142748.2163272-2-robh@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ad858508

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

+45 −56
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ maintainers: 


select: false



properties:

  port:

    description: single OF-Graph subnode

    type: object

properties:

  reg:

    maxItems: 1
@@ -71,11 +67,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:

  - |