From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
nvidia,xxx.yaml is using original ports schemas, but we can now use audio-graph-port.yaml#/definitions/ports[-base] for it. This patch switch to use it.
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- .../bindings/sound/nvidia,tegra186-asrc.yaml | 14 +++---------- .../bindings/sound/nvidia,tegra186-dspk.yaml | 21 ++++++------------- .../sound/nvidia,tegra210-admaif.yaml | 7 +------ .../bindings/sound/nvidia,tegra210-adx.yaml | 14 +++---------- .../bindings/sound/nvidia,tegra210-ahub.yaml | 7 +------ .../bindings/sound/nvidia,tegra210-amx.yaml | 16 +++----------- .../bindings/sound/nvidia,tegra210-dmic.yaml | 21 ++++++------------- .../bindings/sound/nvidia,tegra210-i2s.yaml | 21 ++++++------------- .../bindings/sound/nvidia,tegra210-mixer.yaml | 14 +++---------- .../bindings/sound/nvidia,tegra210-mvc.yaml | 21 ++++++------------- .../bindings/sound/nvidia,tegra210-ope.yaml | 21 ++++++------------- .../bindings/sound/nvidia,tegra210-sfc.yaml | 21 ++++++------------- 12 files changed, 50 insertions(+), 148 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml index d82415c21271..7ab8dd2fc813 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml @@ -45,23 +45,15 @@ properties: pattern: "^ASRC[1-9]$"
ports: - $ref: /schemas/graph.yaml#/properties/ports + $ref: audio-graph-port.yaml#/definitions/ports description: | ASRC has seven input ports and six output ports. Accordingly ACIF (Audio Client Interfaces) port nodes are defined to represent the ASRC inputs (port 0 to 6) and outputs (port 7 to 12). These are connected to corresponding ports on AHUB (Audio Hub). Additional input (port 6) is for receiving ratio information from estimator. - - patternProperties: - '^port@[0-6]': - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: ASRC ACIF input ports - '^port@[7-9]|1[1-2]': - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: ASRC ACIF output ports + port@[0-6] are ASRC ACIF input ports + port@[7-12] are ASRC ACIF output ports
required: - compatible diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml index 3d538df878ea..6cfd36bf21e8 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml @@ -55,21 +55,12 @@ properties: pattern: "^DSPK[1-9]$"
ports: - $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. + $ref: audio-graph-port.yaml#/definitions/ports + description: | + port@0 is DSPK ACIF (Audio Client Interface) port connected to the + corresponding AHUB (Audio Hub) ACIF port. + port@1 is DSPK DAP (Digital Audio Port) interface which can be connected + to external audio codec for playback.
required: - compatible diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml index 15ab40aeab1e..82141af47dce 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml @@ -40,7 +40,7 @@ properties: dma-names: true
ports: - $ref: /schemas/graph.yaml#/properties/ports + $ref: audio-graph-port.yaml#/definitions/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,11 +48,6 @@ 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: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml index ea0dc0ece1bc..877ab4dea539 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml @@ -42,22 +42,14 @@ properties: pattern: "^ADX[1-9]$"
ports: - $ref: /schemas/graph.yaml#/properties/ports + $ref: audio-graph-port.yaml#/definitions/ports description: | ADX has one input and four outputs. Accordingly ACIF (Audio Client Interface) port nodes are defined to represent ADX input (port 0) and outputs (ports 1 to 4). These are connected to corresponding ports on AHUB (Audio Hub). - properties: - port@0: - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: ADX ACIF input port - patternProperties: - '^port@[1-4]': - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: ADX ACIF output ports + port@0 is ADX ACIF input port + port@[1-4] are ADX ACIF output ports
required: - compatible diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml index 89f7805de274..a64cd893deb0 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml @@ -58,18 +58,13 @@ properties: ranges: true
ports: - $ref: /schemas/graph.yaml#/properties/ports + $ref: audio-graph-port.yaml#/definitions/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 diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml index 1aff61f072bb..cd5ca38bef75 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml @@ -42,24 +42,14 @@ properties: pattern: "^AMX[1-9]$"
ports: - $ref: /schemas/graph.yaml#/properties/ports + $ref: audio-graph-port.yaml#/definitions/ports description: | AMX has four inputs and one output. Accordingly ACIF (Audio Client Interfaces) port nodes are defined to represent AMX inputs (port 0 to 3) and output (port 4). These are connected to corresponding ports on AHUB (Audio Hub). - - patternProperties: - '^port@[0-3]': - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: AMX ACIF input ports - - properties: - port@4: - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: AMX ACIF output port + port@[0-3] are AMX ACIF input ports + port@4 is AMX ACIF output port
required: - compatible diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml index 0f9d2b461e02..9166c685ac05 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml @@ -55,21 +55,12 @@ properties: pattern: "^DMIC[1-9]$"
ports: - $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. + $ref: audio-graph-port.yaml#/definitions/ports + description: | + port@0 is DMIC ACIF (Audio Client Interface) port connected to the + corresponding AHUB (Audio Hub) ACIF port. + port@1 is DMIC DAP (Digital Audio Port) interface which can be connected + to external audio codec for capture.
required: - compatible diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml index 12cd17eede99..f8f71a453575 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml @@ -71,21 +71,12 @@ properties: pattern: "^I2S[1-9]$"
ports: - $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. + $ref: audio-graph-port.yaml#/definitions/ports + description: | + port@0 is I2S ACIF (Audio Client Interface) port connected to the + corresponding AHUB (Audio Hub) ACIF port. + port@1 is I2S DAP (Digital Audio Port) interface which can be connected + to external audio codec for playback or capture.
required: - compatible diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml index 570b03282aeb..dd0ba9742c06 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml @@ -40,22 +40,14 @@ properties: pattern: "^MIXER[1-9]$"
ports: - $ref: /schemas/graph.yaml#/properties/ports + $ref: audio-graph-port.yaml#/definitions/ports description: | Mixer has ten inputs and five outputs. Accordingly ACIF (Audio Client Interfaces) port nodes are defined to represent Mixer inputs (port 0 to 9) and outputs (port 10 to 14). These are connected to corresponding ports on AHUB (Audio Hub). - - patternProperties: - '^port@[0-9]': - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: Mixer ACIF input ports - '^port@[10-14]': - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: Mixer ACIF output ports + port@[0-9] are Mixer ACIF input ports + port@[10-14] are Mixer ACIF output ports
required: - compatible diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml index 4aecbc847b98..773b00b081fb 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml @@ -43,21 +43,12 @@ properties: pattern: "^MVC[1-9]$"
ports: - $ref: /schemas/graph.yaml#/properties/ports - properties: - port@0: - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: | - MVC ACIF (Audio Client Interface) input port. This is connected - to corresponding ACIF output port on AHUB (Audio Hub). - - port@1: - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: | - MVC ACIF output port. This is connected to corresponding ACIF - input port on AHUB. + $ref: audio-graph-port.yaml#/definitions/ports + description: | + port@0 is MVC ACIF (Audio Client Interface) input port. This is connected + to corresponding ACIF output port on AHUB (Audio Hub). + port@1 is MVC ACIF output port. This is connected to corresponding ACIF + input port on AHUB.
required: - compatible diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml index 9dc9ba590fa3..89dff2e961db 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml @@ -45,21 +45,12 @@ properties: pattern: "^OPE[1-9]$"
ports: - $ref: /schemas/graph.yaml#/properties/ports - properties: - port@0: - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: - OPE ACIF (Audio Client Interface) input port. This is connected - to corresponding ACIF output port on AHUB (Audio Hub). - - port@1: - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: - OPE ACIF output port. This is connected to corresponding ACIF - input port on AHUB. + $ref: audio-graph-port.yaml#/definitions/ports + description: | + port@0 is OPE ACIF (Audio Client Interface) input port. This is connected + to corresponding ACIF output port on AHUB (Audio Hub). + port@1: is OPE ACIF output port. This is connected to corresponding ACIF + input port on AHUB.
patternProperties: '^equalizer@[0-9a-f]+$': diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml index 694f890d6305..04c550863d88 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml @@ -40,21 +40,12 @@ properties: pattern: "^SFC[1-9]$"
ports: - $ref: /schemas/graph.yaml#/properties/ports - properties: - port@0: - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: | - SFC ACIF (Audio Client Interface) input port. This is connected - to corresponding ACIF output port on AHUB (Audio Hub). - - port@1: - $ref: audio-graph-port.yaml# - unevaluatedProperties: false - description: | - SFC ACIF output port. This is connected to corresponding ACIF - input port on AHUB. + $ref: audio-graph-port.yaml#/definitions/ports + description: | + port@0 is SFC ACIF (Audio Client Interface) input port. This is connected + to corresponding ACIF output port on AHUB (Audio Hub). + port@1 is SFC ACIF output port. This is connected to corresponding ACIF + input port on AHUB.
required: - compatible