forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
- Loading branch information
Showing
28 changed files
with
1,960 additions
and
382 deletions.
There are no files selected for viewing
124 changes: 124 additions & 0 deletions
124
Documentation/devicetree/bindings/sound/audio-graph-card.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| Audio Graph Card: | ||
|
|
||
| Audio Graph Card specifies audio DAI connections of SoC <-> codec. | ||
| It is based on common bindings for device graphs. | ||
| see ${LINUX}/Documentation/devicetree/bindings/graph.txt | ||
|
|
||
| Basically, Audio Graph Card property is same as Simple Card. | ||
| see ${LINUX}/Documentation/devicetree/bindings/sound/simple-card.txt | ||
|
|
||
| Below are same as Simple-Card. | ||
|
|
||
| - label | ||
| - dai-format | ||
| - frame-master | ||
| - bitclock-master | ||
| - bitclock-inversion | ||
| - frame-inversion | ||
| - dai-tdm-slot-num | ||
| - dai-tdm-slot-width | ||
| - clocks / system-clock-frequency | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : "audio-graph-card"; | ||
| - dais : list of CPU DAI port{s} | ||
|
|
||
| Example: Single DAI case | ||
|
|
||
| sound_card { | ||
| compatible = "audio-graph-card"; | ||
|
|
||
| dais = <&cpu_port>; | ||
| }; | ||
|
|
||
| dai-controller { | ||
| ... | ||
| cpu_port: port { | ||
| cpu_endpoint: endpoint { | ||
| remote-endpoint = <&codec_endpoint>; | ||
|
|
||
| dai-format = "left_j"; | ||
| ... | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| audio-codec { | ||
| ... | ||
| port { | ||
| codec_endpoint: endpoint { | ||
| remote-endpoint = <&cpu_endpoint>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| Example: Multi DAI case | ||
|
|
||
| sound-card { | ||
| compatible = "audio-graph-card"; | ||
|
|
||
| label = "sound-card"; | ||
|
|
||
| dais = <&cpu_port0 | ||
| &cpu_port1 | ||
| &cpu_port2>; | ||
| }; | ||
|
|
||
| audio-codec@0 { | ||
| ... | ||
| port { | ||
| codec0_endpoint: endpoint { | ||
| remote-endpoint = <&cpu_endpoint0>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| audio-codec@1 { | ||
| ... | ||
| port { | ||
| codec1_endpoint: endpoint { | ||
| remote-endpoint = <&cpu_endpoint1>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| audio-codec@2 { | ||
| ... | ||
| port { | ||
| codec2_endpoint: endpoint { | ||
| remote-endpoint = <&cpu_endpoint2>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| dai-controller { | ||
| ... | ||
| ports { | ||
| cpu_port0: port@0 { | ||
| cpu_endpoint0: endpoint { | ||
| remote-endpoint = <&codec0_endpoint>; | ||
|
|
||
| dai-format = "left_j"; | ||
| ... | ||
| }; | ||
| }; | ||
| cpu_port1: port@1 { | ||
| cpu_endpoint1: endpoint { | ||
| remote-endpoint = <&codec1_endpoint>; | ||
|
|
||
| dai-format = "i2s"; | ||
| ... | ||
| }; | ||
| }; | ||
| cpu_port2: port@2 { | ||
| cpu_endpoint2: endpoint { | ||
| remote-endpoint = <&codec2_endpoint>; | ||
|
|
||
| dai-format = "i2s"; | ||
| ... | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
117 changes: 117 additions & 0 deletions
117
Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| Audio-Graph-SCU-Card: | ||
|
|
||
| Audio-Graph-SCU-Card is "Audio-Graph-Card" + "ALSA DPCM". | ||
|
|
||
| It is based on common bindings for device graphs. | ||
| see ${LINUX}/Documentation/devicetree/bindings/graph.txt | ||
|
|
||
| Basically, Audio-Graph-SCU-Card property is same as | ||
| Simple-Card / Simple-SCU-Card / Audio-Graph-Card. | ||
| see ${LINUX}/Documentation/devicetree/bindings/sound/simple-card.txt | ||
| ${LINUX}/Documentation/devicetree/bindings/sound/simple-scu-card.txt | ||
| ${LINUX}/Documentation/devicetree/bindings/sound/audio-graph-card.txt | ||
|
|
||
| Below are same as Simple-Card / Audio-Graph-Card. | ||
|
|
||
| - label | ||
| - dai-format | ||
| - frame-master | ||
| - bitclock-master | ||
| - bitclock-inversion | ||
| - frame-inversion | ||
| - dai-tdm-slot-num | ||
| - dai-tdm-slot-width | ||
| - clocks / system-clock-frequency | ||
|
|
||
| Below are same as Simple-SCU-Card. | ||
|
|
||
| - convert-rate | ||
| - convert-channels | ||
| - prefix | ||
| - routing | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : "audio-graph-scu-card"; | ||
| - dais : list of CPU DAI port{s} | ||
|
|
||
| Example 1. Sampling Rate Conversion | ||
|
|
||
| sound_card { | ||
| compatible = "audio-graph-scu-card"; | ||
|
|
||
| label = "sound-card"; | ||
| prefix = "codec"; | ||
| routing = "codec Playback", "DAI0 Playback", | ||
| "codec Playback", "DAI1 Playback"; | ||
| convert-rate = <48000>; | ||
|
|
||
| dais = <&cpu_port>; | ||
| }; | ||
|
|
||
| audio-codec { | ||
| ... | ||
|
|
||
| port { | ||
| codec_endpoint: endpoint { | ||
| remote-endpoint = <&cpu_endpoint>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| dai-controller { | ||
| ... | ||
| cpu_port: port { | ||
| cpu_endpoint: endpoint { | ||
| remote-endpoint = <&codec_endpoint>; | ||
|
|
||
| dai-format = "left_j"; | ||
| ... | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| Example 2. 2 CPU 1 Codec (Mixing) | ||
|
|
||
| sound_card { | ||
| compatible = "audio-graph-scu-card"; | ||
|
|
||
| label = "sound-card"; | ||
| prefix = "codec"; | ||
| routing = "codec Playback", "DAI0 Playback", | ||
| "codec Playback", "DAI1 Playback"; | ||
| convert-rate = <48000>; | ||
|
|
||
| dais = <&cpu_port0 | ||
| &cpu_port1>; | ||
| }; | ||
|
|
||
| audio-codec { | ||
| ... | ||
|
|
||
| port { | ||
| codec_endpoint: endpoint { | ||
| remote-endpoint = <&cpu_endpoint0>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| dai-controller { | ||
| ... | ||
| ports { | ||
| cpu_port0: port { | ||
| cpu_endpoint0: endpoint { | ||
| remote-endpoint = <&codec_endpoint>; | ||
|
|
||
| dai-format = "left_j"; | ||
| ... | ||
| }; | ||
| }; | ||
| cpu_port1: port { | ||
| cpu_endpoint1: endpoint { | ||
| dai-format = "left_j"; | ||
| ... | ||
| }; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.