Skip to content
This repository has been archived by the owner on Jan 17, 2019. It is now read-only.

topology fix for UP2 #19

Merged
merged 2 commits into from
Jul 6, 2018
Merged

topology fix for UP2 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfe7fa9
topology: test: set id to 0 for codec topology
xiulipan Jul 6, 2018
794cf7a
topology: fix id for sof_apl_pcm512x topology
xiulipan Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 26 additions & 29 deletions topology/sof-apl-pcm512x.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,73 +21,70 @@ include(`platform/intel/dmic.m4')
#
# Define the pipelines
#
# PCM0 <---- volume <----- DMIC0 (SSP3)
# PCM1 ----> volume -----> SSP5 (pcm512x)
# PCM0 ----> volume -----> SSP5 (pcm512x)
# <---- volume <----- SSP5
# PCM1 <---- volume <----- DMIC0 (SSP3)
#

# Low Latency capture pipeline 1 on PCM 0 using max 4 channels of s32le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
1, 0, 4, s32le,
48, 1000, 0, 0, DMIC, 0, s32le, 2)

# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
2, 1, 2, s16le,
1, 0, 2, s16le,
48, 1000, 0, 0, SSP, 5, s16le, 2)

# Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
3, 1, 2, s16le,
2, 0, 2, s16le,
48, 1000, 0, 0, SSP, 5, s16le, 2)

# Low Latency capture pipeline 1 on PCM 0 using max 4 channels of s32le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
3, 1, 4, s32le,
48, 1000, 0, 0, DMIC, 0, s32le, 2)

#
# DAIs configuration
#

# capture DAI is DMIC0 using 2 periods
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
1, DMIC, 0, DMIC0,
PIPELINE_SINK_1, 2, s32le,
48, 1000, 0, 0)

# playback DAI is SSP5 using 2 periods
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
2, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_2, 2, s16le,
1, SSP, 5, SSP5-Codec,
PIPELINE_SOURCE_1, 2, s16le,
48, 1000, 0, 0)

# capture DAI is SSP5 using 2 periods
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
3, SSP, 5, SSP5-Codec,
PIPELINE_SINK_3, 2, s16le,
2, SSP, 5, SSP5-Codec,
PIPELINE_SINK_2, 2, s16le,
48, 1000, 0, 0)

# capture DAI is DMIC0 using 2 periods
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
3, DMIC, 0, DMIC0,
PIPELINE_SINK_3, 2, s32le,
48, 1000, 0, 0)

# PCM Low Latency, id 0
PCM_CAPTURE_ADD(Dmic0, 0, 0, 0, PIPELINE_PCM_1)
PCM_DUPLEX_ADD(Port5, 1, 1, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)
PCM_DUPLEX_ADD(Port5, 0, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
PCM_CAPTURE_ADD(Dmic0, 1, 1, 1, PIPELINE_PCM_3)

#
# BE configurations - overrides config in ACPI if present
#

DAI_CONFIG(DMIC, 0, 0, DMIC0,
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
DMIC_WORD_LENGTH(s32le), DMIC, 0,
PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1)))

DAI_CONFIG(SSP, 5, 1, SSP5-Codec,
DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
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)))

DAI_CONFIG(DMIC, 0, 1, DMIC0,
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
DMIC_WORD_LENGTH(s32le), DMIC, 0,
PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1)))
4 changes: 3 additions & 1 deletion topology/test/test-all.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
#
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT,
ifelse(index(TEST_DAI_LINK_NAME, NoCodec), -1, 0 ,TEST_DAI_PORT),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can make everybody happy at the moment, but considering that we actually use same machine driver for normal(soft/topology/xx.m4) and test(soft/topology/test/xx) tplg files. In this case, only the first BE dai_link(with .id=0) works with test tplg file, all others doesn't work.

But I can imagine that adding an extra param for it may introduce more effort, especially for batch tplgs generated with scripts.

TEST_DAI_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
Expand Down