Skip to content

Commit

Permalink
ASoC: dt-bindings: tegra: Add graph bindings
Browse files Browse the repository at this point in the history
Add device tree binding properties of generic graph to ASoC component
devices. This allows to define audio ports out of these components or
DAIs and audio graph based sound card can be realised with this.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/1611048496-24650-2-git-send-email-spujar@nvidia.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Sameer Pujar authored and Mark Brown committed Jan 19, 2021
1 parent 39860fe commit 9e0f86f
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ maintainers:
- Jon Hunter <jonathanh@nvidia.com>
- Sameer Pujar <spujar@nvidia.com>

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

properties:
$nodename:
pattern: "^dspk@[0-9a-f]*$"
Expand Down Expand Up @@ -55,6 +58,19 @@ properties:
The name can be "DSPK1" or "DSPKx", where x depends on the maximum
available instances on a Tegra SoC.

ports:
type: object
properties:
port@0:
description: |
DSPK ACIF (Audio Client Interface) port connected to the
corresponding AHUB (Audio Hub) ACIF port.
port@1:
description: |
DSPK DAP (Digital Audio Port) interface which can be connected
to external audio codec for playback.
required:
- compatible
- reg
Expand All @@ -64,7 +80,7 @@ required:
- assigned-clock-parents
- sound-name-prefix

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ maintainers:
- Jon Hunter <jonathanh@nvidia.com>
- Sameer Pujar <spujar@nvidia.com>

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

properties:
$nodename:
pattern: "^admaif@[0-9a-f]*$"
Expand All @@ -37,6 +40,14 @@ properties:

dma-names: true

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
that SoC may have. These are interfaced with respective ACIF ports
in AHUB (Audio Hub). Each port is capable of data transfers in
both directions.
if:
properties:
compatible:
Expand Down Expand Up @@ -81,7 +92,7 @@ required:
- dmas
- dma-names

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
13 changes: 11 additions & 2 deletions Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ maintainers:
- Jon Hunter <jonathanh@nvidia.com>
- Sameer Pujar <spujar@nvidia.com>

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

properties:
$nodename:
pattern: "^ahub@[0-9a-f]*$"
Expand Down Expand Up @@ -56,6 +59,13 @@ properties:

ranges: true

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.
required:
- compatible
- reg
Expand All @@ -67,8 +77,7 @@ required:
- "#size-cells"
- ranges

additionalProperties:
type: object
unevaluatedProperties: false

examples:
- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ maintainers:
- Jon Hunter <jonathanh@nvidia.com>
- Sameer Pujar <spujar@nvidia.com>

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

properties:
$nodename:
pattern: "^dmic@[0-9a-f]*$"
Expand Down Expand Up @@ -56,6 +59,19 @@ properties:
The name can be "DMIC1" or "DMIC2" ... "DMICx", where x depends
on the maximum available instances on a Tegra SoC.

ports:
type: object
properties:
port@0:
description: |
DMIC ACIF (Audio Client Interface) port connected to the
corresponding AHUB (Audio Hub) ACIF port.
port@1:
description: |
DMIC DAP (Digital Audio Port) interface which can be connected
to external audio codec for capture.
required:
- compatible
- reg
Expand All @@ -64,7 +80,7 @@ required:
- assigned-clocks
- assigned-clock-parents

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
18 changes: 17 additions & 1 deletion Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ maintainers:
- Jon Hunter <jonathanh@nvidia.com>
- Sameer Pujar <spujar@nvidia.com>

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

properties:
$nodename:
pattern: "^i2s@[0-9a-f]*$"
Expand Down Expand Up @@ -74,6 +77,19 @@ properties:
The name can be "I2S1" or "I2S2" ... "I2Sx", where x depends
on the maximum available instances on a Tegra SoC.

ports:
type: object
properties:
port@0:
description: |
I2S ACIF (Audio Client Interface) port connected to the
corresponding AHUB (Audio Hub) ACIF port.
port@1:
description: |
I2S DAP (Digital Audio Port) interface which can be connected
to external audio codec for playback or capture.
required:
- compatible
- reg
Expand All @@ -82,7 +98,7 @@ required:
- assigned-clocks
- assigned-clock-parents

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down

0 comments on commit 9e0f86f

Please sign in to comment.