-
Notifications
You must be signed in to change notification settings - Fork 349
[RFC]topology: Add nocodec demux test tplg #2958
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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,203 @@ | ||
| # | ||
| # Topology for generic Apollolake board with no codec and digital mic array. | ||
| # | ||
| # APL Host GW DMAC support max 6 playback and max 6 capture channels so some | ||
| # pipelines/PCMs/DAIs are commented out to keep within HW bounds. If these | ||
| # are needed then they can be used provided other PCMs/pipelines/SSPs are | ||
| # commented out in their place. | ||
|
|
||
| # Include topology builder | ||
| include(`utils.m4') | ||
| include(`dai.m4') | ||
| include(`ssp.m4') | ||
| include(`muxdemux.m4') | ||
| include(`pipeline.m4') | ||
|
|
||
| # Include TLV library | ||
| include(`common/tlv.m4') | ||
|
|
||
| # Include Token library | ||
| include(`sof/tokens.m4') | ||
|
|
||
| # Include Apollolake DSP configuration | ||
| include(`platform/intel/bxt.m4') | ||
| include(`platform/intel/dmic.m4') | ||
|
|
||
| DEBUG_START | ||
| dnl Configure demux | ||
| dnl name, pipeline_id, routing_matrix_rows | ||
| dnl Diagonal 1's in routing matrix mean that every input channel is | ||
| dnl copied to corresponding output channels in all output streams. | ||
| dnl I.e. row index is the input channel, 1 means it is copied to | ||
| dnl corresponding output channel (column index), 0 means it is discarded. | ||
| dnl There's a separate matrix for all outputs. | ||
| define(matrix1, `ROUTE_MATRIX(1, | ||
| `BITS_TO_BYTE(1, 0, 0 ,0 ,0 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 1, 0 ,0 ,0 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 1 ,0 ,0 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,1 ,0 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,0 ,1 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,1 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,1 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')') | ||
|
|
||
| define(matrix2, `ROUTE_MATRIX(5, | ||
| `BITS_TO_BYTE(1, 0, 0 ,0 ,0 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 1, 0 ,0 ,0 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 1 ,0 ,0 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,1 ,0 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,0 ,1 ,0 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,1 ,0 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,1 ,0)', | ||
| `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')') | ||
|
|
||
| dnl name, num_streams, route_matrix list | ||
| MUXDEMUX_CONFIG(demux_priv, 2, LIST(` ', `matrix1,', `matrix2')) | ||
| # | ||
| # Define the pipelines | ||
| # | ||
| # PCM0 <---> volume <----> SSP0 | ||
| # PCM6 <---- volume <----- DMIC6 (DMIC01) | ||
| # | ||
|
|
||
| dnl PIPELINE_PCM_ADD(pipeline, | ||
| dnl pipe id, pcm, max channels, format, | ||
| dnl period, priority, core, | ||
| dnl pcm_min_rate, pcm_max_rate, pipeline_rate, | ||
| dnl time_domain, sched_comp) | ||
|
|
||
| # Demux pipeline 1 on PCM 0 using max 2 channels of s32le. | ||
| # Set 1000us deadline on core 0 with priority 0 | ||
| PIPELINE_PCM_ADD(sof/pipe-volume-demux-playback.m4, | ||
| 1, 0, 4, s32le, | ||
| 1000, 0, 0, | ||
| 48000, 48000, 48000) | ||
|
|
||
| # Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s16le. | ||
| # 1000us deadline on core 0 with priority 0 | ||
| PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, | ||
| 2, 0, 4, s32le, | ||
| 1000, 0, 0, | ||
| 48000, 48000, 48000) | ||
|
|
||
| # Low Latency playback pipeline 11 on PCM 5 using max 2 channels of s16le. | ||
| # 1000us deadline on core 0 with priority 0 | ||
| PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, | ||
| 11, 5, 2, s32le, | ||
| 1000, 0, 0, | ||
| 48000, 48000, 48000) | ||
|
|
||
| # Passthrough capture pipeline 13 on PCM 6 using max 2 channels. | ||
| # 1000us deadline on core 0 with priority 0 | ||
| PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, | ||
| 13, 6, 2, s32le, | ||
| 1000, 0, 0, | ||
| 48000, 48000, 48000) | ||
|
|
||
| # | ||
| # DAIs configuration | ||
| # | ||
|
|
||
| dnl DAI_ADD(pipeline, | ||
| dnl pipe id, dai type, dai_index, dai_be, | ||
| dnl buffer, periods, format, | ||
| dnl deadline, priority, core, time_domain) | ||
|
|
||
| # playback DAI is SSP0 using 2 periods | ||
| # Buffers use s16le format, 1000us deadline on core 0 with priority 0 | ||
| DAI_ADD(sof/pipe-dai-playback.m4, | ||
| 1, SSP, 0, NoCodec-0, | ||
| PIPELINE_SOURCE_1, 2, s16le, | ||
| 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) | ||
|
|
||
| # playback DAI is SSP5 using 2 periods | ||
| # Buffers use s16le format, 1000us deadline on core 0 with priority 0 | ||
| DAI_ADD(sof/pipe-dai-playback.m4, | ||
| 11, SSP, 5, NoCodec-5, | ||
| PIPELINE_SOURCE_11, 2, s16le, | ||
| 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) | ||
|
|
||
| # currently this dai is here as "virtual" capture backend | ||
| W_DAI_IN(SSP, 5, NoCodec-5, s24le, 3, 0) | ||
|
|
||
| # Capture pipeline 5 from demux on PCM 4 using max 2 channels of s32le. | ||
| PIPELINE_PCM_ADD(sof/pipe-passthrough-capture-sched.m4, | ||
| 5, 4, 2, s32le, | ||
| 1000, 1, 0, | ||
| 48000, 48000, 48000, | ||
| SCHEDULE_TIME_DOMAIN_TIMER, | ||
| PIPELINE_PLAYBACK_SCHED_COMP_1) | ||
|
|
||
| # Connect demux to capture | ||
| SectionGraph."PIPE_CAP" { | ||
| index "0" | ||
|
|
||
| lines [ | ||
| # mux to capture | ||
| dapm(PIPELINE_SINK_5, PIPELINE_DEMUX_1) | ||
| ] | ||
| } | ||
|
|
||
| # Connect virtual capture to dai | ||
| SectionGraph."PIPE_CAP_VIRT" { | ||
| index "5" | ||
|
|
||
| lines [ | ||
| # mux to capture | ||
| dapm(ECHO REF 5, SSP5.IN) | ||
| ] | ||
| } | ||
|
|
||
| # capture DAI is SSP0 using 2 periods | ||
| # Buffers use s16le format, 1000us deadline on core 0 with priority 0 | ||
| DAI_ADD(sof/pipe-dai-capture.m4, | ||
| 2, SSP, 0, NoCodec-0, | ||
| PIPELINE_SINK_2, 2, s16le, | ||
| 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) | ||
|
|
||
| # capture DAI is DMIC 0 using 2 periods | ||
| # Buffers use s32le format, 1000us deadline on core 0 with priority 0 | ||
| DAI_ADD(sof/pipe-dai-capture.m4, | ||
| 13, DMIC, 0, NoCodec-6, | ||
| PIPELINE_SINK_13, 2, s32le, | ||
| 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) | ||
|
|
||
| dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) | ||
| PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) | ||
| PCM_PLAYBACK_ADD(Port5, 5, PIPELINE_PCM_11) | ||
| PCM_CAPTURE_ADD(EchoRef, 4, PIPELINE_PCM_5) | ||
| dnl PCM_CAPTURE_ADD(name, pipeline, capture) | ||
| PCM_CAPTURE_ADD(DMIC, 6, PIPELINE_PCM_13) | ||
|
|
||
| # | ||
| # BE configurations - overrides config in ACPI if present | ||
| # | ||
|
|
||
| dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) | ||
| DAI_CONFIG(SSP, 0, 0, NoCodec-0, | ||
| dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) | ||
| SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), | ||
| SSP_CLOCK(bclk, 3072000, codec_slave), | ||
| SSP_CLOCK(fsync, 48000, codec_slave), | ||
| SSP_TDM(4, 16, 15, 15), | ||
| dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks) | ||
| SSP_CONFIG_DATA(SSP, 0, 16, 0, SSP_QUIRK_LBM))) | ||
|
|
||
| DAI_CONFIG(SSP, 5, 5, NoCodec-5, | ||
| SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), | ||
| SSP_CLOCK(bclk, 1536000, codec_slave), | ||
| SSP_CLOCK(fsync, 48000, codec_slave), | ||
| SSP_TDM(2, 16, 3, 3), | ||
| SSP_CONFIG_DATA(SSP, 5, 16, 0, SSP_QUIRK_LBM))) | ||
|
|
||
| DAI_CONFIG(DMIC, 0, 6, NoCodec-6, | ||
| dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max, | ||
| dnl sample_rate, fifo word length, unmute time, type, | ||
| dnl dai_index, pdm controller config) | ||
| DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000, | ||
| DMIC_WORD_LENGTH(s32le), 400, DMIC, 0, | ||
| dnl PDM_CONFIG(type, dai_index, num pdm active, pdm tuples list) | ||
| dnl STEREO_PDM0 is a pre-defined pdm config for stereo capture | ||
| PDM_CONFIG(DMIC, 0, STEREO_PDM0))) | ||
|
|
||
| DEBUG_END | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@xiulipan
I have one question, maybe I am missing something. Why we set here DAI format to s16le? Maybe better it will be to set DAI and SSP TDM format to s32_le. In that case, DAI will make PCM conversion if required. In #2959 case, when we will try to play s16, DAI should make conversion from s16 to s32.