From 0f15d66ac6b3b3bfe7a941c9306e6117a71a7d17 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Thu, 14 Feb 2019 13:44:44 -0800 Subject: [PATCH 1/2] topology: cml: change SSP port num for rt5682 The CML board has the rt5682 connected to SSP0 and the machine driver defines the dai link for the headset with the name "SSP0-codec" too. So change the topology file accordingly. Signed-off-by: Ranjani Sridharan --- tools/topology/sof-cml-rt5682.m4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/topology/sof-cml-rt5682.m4 b/tools/topology/sof-cml-rt5682.m4 index 2cc4f4995793..b9e0f62f550d 100644 --- a/tools/topology/sof-cml-rt5682.m4 +++ b/tools/topology/sof-cml-rt5682.m4 @@ -23,7 +23,7 @@ DEBUG_START # # Define the pipelines # -# PCM0 <---> volume <----> SSP1 +# PCM0 <---> volume <----> SSP0 # PCM1 ----> volume -----> DMIC01 (dmic0 capture) # PCM2 ----> volume -----> iDisp1 # PCM3 ----> volume -----> iDisp2 @@ -82,14 +82,14 @@ dnl frames, deadline, priority, core) # playback DAI is SSP1 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 1, SSP1-Codec, + 1, SSP, 0, SSP0-Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP1 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 1, SSP1-Codec, + 2, SSP, 0, SSP0-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) @@ -134,12 +134,12 @@ PCM_PLAYBACK_ADD(HDMI3, 4, PIPELINE_PCM_6) # #SSP 1 (ID: 0) -DAI_CONFIG(SSP, 1, 0, SSP1-Codec, +DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), SSP_CLOCK(bclk, 2400000, codec_slave), SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), - SSP_CONFIG_DATA(SSP, 1, 24))) + SSP_CONFIG_DATA(SSP, 0, 24))) # dmic01 (ID: 1) DAI_CONFIG(DMIC, 0, 1, dmic01, From 06acc82f66640cef827fb02fc4eba40db39c60fc Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Thu, 14 Feb 2019 13:45:27 -0800 Subject: [PATCH 2/2] topology: whl: add topology for whl with rt5682 Add topology for WHL with RT5682. This will be merged with sof-cml-rt5682 in the future to avoid maintaining 2 files with just the difference in SSP port numbers. Signed-off-by: Ranjani Sridharan --- tools/topology/CMakeLists.txt | 1 + tools/topology/sof-whl-rt5682.m4 | 156 +++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 tools/topology/sof-whl-rt5682.m4 diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index cde5ec5b8b4d..b225dd000970 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -36,6 +36,7 @@ set(MACHINES sof-icl-dmic-4ch sof-apl-src-pcm512x sof-cml-rt5682 + sof-whl-rt5682 sof-cml-src-rt5682 sof-cnl-nocodec ) diff --git a/tools/topology/sof-whl-rt5682.m4 b/tools/topology/sof-whl-rt5682.m4 new file mode 100644 index 000000000000..2cc4f4995793 --- /dev/null +++ b/tools/topology/sof-whl-rt5682.m4 @@ -0,0 +1,156 @@ +# +# Topology for Cometlake with rt5682 codec. +# + +# Include topology builder +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') +include(`ssp.m4') + +# Include TLV library +include(`common/tlv.m4') + +# Include Token library +include(`sof/tokens.m4') + +# Include Cannonlake DSP configuration +include(`platform/intel/cnl.m4') +include(`platform/intel/dmic.m4') + +DEBUG_START + +# +# Define the pipelines +# +# PCM0 <---> volume <----> SSP1 +# PCM1 ----> volume -----> DMIC01 (dmic0 capture) +# PCM2 ----> volume -----> iDisp1 +# PCM3 ----> volume -----> iDisp2 +# PCM4 ----> volume -----> iDisp3 +# + +dnl PIPELINE_PCM_ADD(pipeline, +dnl pipe id, pcm, max channels, format, +dnl frames, deadline, priority, core) + +# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, + 1, 0, 2, s24le, + 48, 1000, 0, 0) + +# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, + 2, 0, 2, s24le, + 48, 1000, 0, 0) + +# Passthrough capture pipeline 3 on PCM 1 using max 4 channels. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, + 3, 1, 4, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 4 on PCM 2 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, + 4, 2, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 5 on PCM 3 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, + 5, 3, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 6 on PCM 4 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, + 6, 4, 2, s32le, + 48, 1000, 0, 0) + +# +# DAIs configuration +# + +dnl DAI_ADD(pipeline, +dnl pipe id, dai type, dai_index, dai_be, +dnl buffer, periods, format, +dnl frames, deadline, priority, core) + +# playback DAI is SSP1 using 2 periods +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 1, SSP, 1, SSP1-Codec, + PIPELINE_SOURCE_1, 2, s24le, + 48, 1000, 0, 0) + +# capture DAI is SSP1 using 2 periods +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-capture.m4, + 2, SSP, 1, SSP1-Codec, + PIPELINE_SINK_2, 2, s24le, + 48, 1000, 0, 0) + +# capture DAI is DMIC01 using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-capture.m4, + 3, DMIC, 0, dmic01, + PIPELINE_SINK_3, 2, s32le, + 48, 1000, 0, 0) + +# playback DAI is iDisp1 using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 4, HDA, 0, iDisp1, + PIPELINE_SOURCE_4, 2, s32le, + 48, 1000, 0, 0) + +# playback DAI is iDisp2 using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 5, HDA, 1, iDisp2, + PIPELINE_SOURCE_5, 2, s32le, + 48, 1000, 0, 0) + +# playback DAI is iDisp3 using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 6, HDA, 2, iDisp3, + PIPELINE_SOURCE_6, 2, s32le, + 48, 1000, 0, 0) + +# PCM Low Latency, id 0 +dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) +PCM_DUPLEX_ADD(Port1, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) +PCM_CAPTURE_ADD(DMIC01, 1, PIPELINE_PCM_3) +PCM_PLAYBACK_ADD(HDMI1, 2, PIPELINE_PCM_4) +PCM_PLAYBACK_ADD(HDMI2, 3, PIPELINE_PCM_5) +PCM_PLAYBACK_ADD(HDMI3, 4, PIPELINE_PCM_6) + +# +# BE configurations - overrides config in ACPI if present +# + +#SSP 1 (ID: 0) +DAI_CONFIG(SSP, 1, 0, SSP1-Codec, + SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), + SSP_TDM(2, 25, 3, 3), + SSP_CONFIG_DATA(SSP, 1, 24))) + +# dmic01 (ID: 1) +DAI_CONFIG(DMIC, 0, 1, dmic01, + DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000, + DMIC_WORD_LENGTH(s32le), DMIC, 0, + PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1))) + +# 3 HDMI/DP outputs (ID: 2,3,4) +DAI_CONFIG(HDA, 0, 2, iDisp1) +DAI_CONFIG(HDA, 0, 3, iDisp2) +DAI_CONFIG(HDA, 0, 4, iDisp3) + + +DEBUG_END