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
2021-04-01 10:25:13 +01:00 · 2021-04-01 10:25:13 +01:00 · 75c324d5ab
parent 73935e931c f1321c9766
commit 75c324d5ab
10 changed files with 89 additions and 97 deletions
--- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml
+++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml
@ -11,71 +11,59 @@ maintainers:

 select: false

+allOf:
+  - $ref: /schemas/graph.yaml#/$defs/port-base
+
 properties:
-  port:
-    description: single OF-Graph subnode
-    type: object
+  prefix:
+    description: "device name prefix"
+    $ref: /schemas/types.yaml#/definitions/string
+  convert-rate:
+    description: CPU to Codec rate convert.
+    $ref: /schemas/types.yaml#/definitions/uint32
+  convert-channels:
+    description: CPU to Codec rate channels.
+    $ref: /schemas/types.yaml#/definitions/uint32
+patternProperties:
+  "^endpoint(@[0-9a-f]+)?":
+    $ref: /schemas/graph.yaml#/$defs/endpoint-base
    properties:
-      reg:
-        maxItems: 1
-      prefix:
-        description: "device name prefix"
-        $ref: /schemas/types.yaml#/definitions/string
+      mclk-fs:
+        description: |
+          Multiplication factor between stream rate and codec mclk.
+          When defined, mclk-fs property defined in dai-link sub nodes are
+          ignored.
+        $ref: /schemas/types.yaml#/definitions/uint32
+      frame-inversion:
+        description: dai-link uses frame clock inversion
+        $ref: /schemas/types.yaml#/definitions/flag
+      bitclock-inversion:
+        description: dai-link uses bit clock inversion
+        $ref: /schemas/types.yaml#/definitions/flag
+      frame-master:
+        description: Indicates dai-link frame master.
+        $ref: /schemas/types.yaml#/definitions/phandle
+      bitclock-master:
+        description: Indicates dai-link bit clock master
+        $ref: /schemas/types.yaml#/definitions/phandle
+      dai-format:
+        description: audio format.
+        items:
+          enum:
+            - i2s
+            - right_j
+            - left_j
+            - dsp_a
+            - dsp_b
+            - ac97
+            - pdm
+            - msb
+            - lsb
      convert-rate:
        description: CPU to Codec rate convert.
        $ref: /schemas/types.yaml#/definitions/uint32
      convert-channels:
        description: CPU to Codec rate channels.
        $ref: /schemas/types.yaml#/definitions/uint32
-    patternProperties:
-      "^endpoint(@[0-9a-f]+)?":
-        type: object
-        properties:
-          remote-endpoint:
-            maxItems: 1
-          mclk-fs:
-            description: |
-              Multiplication factor between stream rate and codec mclk.
-              When defined, mclk-fs property defined in dai-link sub nodes are
-              ignored.
-            $ref: /schemas/types.yaml#/definitions/uint32
-          frame-inversion:
-            description: dai-link uses frame clock inversion
-            $ref: /schemas/types.yaml#/definitions/flag
-          bitclock-inversion:
-            description: dai-link uses bit clock inversion
-            $ref: /schemas/types.yaml#/definitions/flag
-          frame-master:
-            description: Indicates dai-link frame master.
-            $ref: /schemas/types.yaml#/definitions/phandle
-          bitclock-master:
-            description: Indicates dai-link bit clock master
-            $ref: /schemas/types.yaml#/definitions/phandle
-          dai-format:
-            description: audio format.
-            items:
-              enum:
-                - i2s
-                - right_j
-                - left_j
-                - dsp_a
-                - dsp_b
-                - ac97
-                - pdm
-                - msb
-                - lsb
-          convert-rate:
-            description: CPU to Codec rate convert.
-            $ref: /schemas/types.yaml#/definitions/uint32
-          convert-channels:
-            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
--- a/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml
+++ b/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml
@ -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:
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml
@ -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:
  - |
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
@ -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:
  - |
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml
@ -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:
  - |
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml
@ -16,9 +16,6 @@ maintainers:
  - Jon Hunter <jonathanh@nvidia.com>
  - Sameer Pujar <spujar@nvidia.com>

-allOf:
-  - $ref: audio-graph-port.yaml#
-
 properties:
  $nodename:
    pattern: "^dmic@[0-9a-f]*$"
@ -60,14 +57,18 @@ properties:
      on the maximum 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: |
          DMIC ACIF (Audio Client Interface) port connected to the
          corresponding AHUB (Audio Hub) ACIF port.

      port@1:
+        $ref: audio-graph-port.yaml#
+        unevaluatedProperties: false
        description: |
          DMIC DAP (Digital Audio Port) interface which can be connected
          to external audio codec for capture.
@ -80,7 +81,7 @@ required:
  - assigned-clocks
  - assigned-clock-parents

-unevaluatedProperties: false
+additionalProperties: false

 examples:
  - |
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml
@ -16,9 +16,6 @@ maintainers:
  - Jon Hunter <jonathanh@nvidia.com>
  - Sameer Pujar <spujar@nvidia.com>

-allOf:
-  - $ref: audio-graph-port.yaml#
-
 properties:
  $nodename:
    pattern: "^i2s@[0-9a-f]*$"
@ -78,14 +75,18 @@ properties:
      on the maximum 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: |
          I2S ACIF (Audio Client Interface) port connected to the
          corresponding AHUB (Audio Hub) ACIF port.

      port@1:
+        $ref: audio-graph-port.yaml#
+        unevaluatedProperties: false
        description: |
          I2S DAP (Digital Audio Port) interface which can be connected
          to external audio codec for playback or capture.
@ -98,7 +99,7 @@ required:
  - assigned-clocks
  - assigned-clock-parents

-unevaluatedProperties: false
+additionalProperties: false

 examples:
  - |
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml
@ -111,7 +111,9 @@ properties:
        - pattern: '^dvc\.[0-1]$'
        - pattern: '^clk_(a|b|c|i)$'

-  port: true
+  port:
+    $ref: audio-graph-port.yaml#
+    unevaluatedProperties: false

 # use patternProperties to avoid naming "xxx,yyy" issue
 patternProperties:
@ -257,7 +259,6 @@ required:

 allOf:
  - $ref: audio-graph.yaml#
-  - $ref: audio-graph-port.yaml#
  - if:
      properties:
        compatible:
--- a/Documentation/devicetree/bindings/sound/socionext,uniphier-aio.yaml
+++ b/Documentation/devicetree/bindings/sound/socionext,uniphier-aio.yaml
@ -46,11 +46,9 @@ properties:

 patternProperties:
  "^port@[0-9]$":
-    type: object
-    properties:
-      endpoint: true
-    required:
-      - endpoint
+    description: FIXME, Need to define what each port is.
+    $ref: audio-graph-port.yaml#
+    unevaluatedProperties: false

 additionalProperties: false

--- a/Documentation/devicetree/bindings/sound/socionext,uniphier-evea.yaml
+++ b/Documentation/devicetree/bindings/sound/socionext,uniphier-evea.yaml
@ -40,11 +40,9 @@ properties:

 patternProperties:
  "^port@[0-9]$":
-    type: object
-    properties:
-      endpoint: true
-    required:
-      - endpoint
+    description: FIXME, Need to define what each port is.
+    $ref: audio-graph-port.yaml#
+    unevaluatedProperties: false

 additionalProperties: false