From 8e44603f633db2f8ecb45bd17f68c0d290754a51 Mon Sep 17 00:00:00 2001 From: macchian Date: Tue, 23 Jul 2019 11:15:13 +0800 Subject: [PATCH 1/2] topology: cml: topology migration support for da7219+max98357a variant refer to 0.4 topology file, migrate to 0.7 by adding supports: 1. dmic16k capture 2. 48KHz speaker playback by m/n divider 3. remove warning widgets messages Signed-off-by: Mac Chiang --- tools/topology/CMakeLists.txt | 1 + tools/topology/sof-cml-da7219-max98357a.m4 | 238 +++++++++++++++++++++ 2 files changed, 239 insertions(+) create mode 100644 tools/topology/sof-cml-da7219-max98357a.m4 diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index 050ed24598c9..1b2c70adb612 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -68,6 +68,7 @@ set(TPLGS "sof-cml-demux-rt5682\;sof-cml-demux-rt5682\;-DPLATFORM=whl" "sof-cnl-nocodec\;sof-cnl-nocodec" "sof-cml-rt5682-max98357a\;sof-cml-rt5682-max98357a\;-DPLATFORM=cml" + "sof-cml-da7219-max98357a\;sof-cml-da7219-max98357a" ) add_custom_target(topologies ALL) diff --git a/tools/topology/sof-cml-da7219-max98357a.m4 b/tools/topology/sof-cml-da7219-max98357a.m4 new file mode 100644 index 000000000000..6a6ea7309eeb --- /dev/null +++ b/tools/topology/sof-cml-da7219-max98357a.m4 @@ -0,0 +1,238 @@ +# +# Topology for Cometlake with da7219 headset on SSP0, max98357a spk on SSP1 +# + +# 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') +include(`abi.h') + +DEBUG_START + +# +# Define the pipelines +# +# PCM0 ----> volume -----> SSP1 (speaker - maxim98357a, BE link 0) +# PCM1 <---> volume <----> SSP0 (headset - da7219, BE link 1) +# PCM2 <---- DMIC01 (dmic0 capture, BE link 2) +# PCM5 ----> volume -----> iDisp1 (HDMI/DP playback, BE link 3) +# PCM6 ----> volume -----> iDisp2 (HDMI/DP playback, BE link 4) +# PCM7 ----> volume -----> iDisp3 (HDMI/DP playback, BE link 5) +# PCM8 <---- volume <----- DMIC16k (dmic16k, BE link 6) +# + +dnl PIPELINE_PCM_ADD(pipeline, +dnl pipe id, pcm, max channels, format, +dnl frames, deadline, priority, core) + +# Low Latency playback pipeline 1 on PCM 1 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, + 1, 1, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency capture pipeline 2 on PCM 1 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, + 2, 1, 2, s32le, + 48, 1000, 0, 0) + +# Passthrough capture pipeline 3 on PCM 2 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, 2, 4, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 4 on PCM 5 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, 5, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 5 on PCM 6 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, 6, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 6 on PCM 7 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, 7, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 7 on PCM 0 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1', +`PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, + 7, 0, 2, s32le, + 48, 1000, 0, 0)', +`PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4, + 7, 0, 2, s32le, + 48, 1000, 0, 0)') + +# Passthrough capture pipeline 8 on PCM 8 using max 2 channels. +# Schedule 16 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-volume-capture-16khz.m4, + 8, 8, 2, s24le, + 16, 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 SSP0 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, + 1, SSP, 0, SSP0-Codec, + PIPELINE_SOURCE_1, 2, s16le, + 48, 1000, 0, 0) + +# capture DAI is SSP0 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, + 2, SSP, 0, SSP0-Codec, + PIPELINE_SINK_2, 2, s16le, + 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, SCHEDULE_TIME_DOMAIN_TIMER) + +# 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, SCHEDULE_TIME_DOMAIN_TIMER) + +# 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, SCHEDULE_TIME_DOMAIN_TIMER) + +# playback DAI is SSP1 using 2 periods +# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +#With m/n divider available we can support 24 bit playback + +ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1', +`DAI_ADD(sof/pipe-dai-playback.m4, + 7, SSP, 1, SSP1-Codec, + PIPELINE_SOURCE_7, 2, s24le, + 48, 1000, 0, 0)', +`DAI_ADD(sof/pipe-dai-playback.m4, + 7, SSP, 1, SSP1-Codec, + PIPELINE_SOURCE_7, 2, s16le, + 48, 1000, 0, 0)') + +# capture DAI is DMIC16k using 2 periods +# Buffers use s32le format, with 16 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-capture.m4, + 8, DMIC, 1, dmic16k, + PIPELINE_SINK_8, 2, s32le, + 16, 1000, 0, 0) + +# PCM Low Latency, id 0 +dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) +PCM_PLAYBACK_ADD(Speakers, 0, PIPELINE_PCM_7) +PCM_DUPLEX_ADD(Headset, 1, PIPELINE_PCM_1, PIPELINE_PCM_2) +PCM_CAPTURE_ADD(DMIC01, 2, PIPELINE_PCM_3) +PCM_PLAYBACK_ADD(HDMI1, 5, PIPELINE_PCM_4) +PCM_PLAYBACK_ADD(HDMI2, 6, PIPELINE_PCM_5) +PCM_PLAYBACK_ADD(HDMI3, 7, PIPELINE_PCM_6) +PCM_CAPTURE_ADD(DMIC16k, 8, PIPELINE_PCM_8) + +# +# BE configurations - overrides config in ACPI if present +# + +#SSP 1 (ID: 0) +# Use BCLK derived using m/n divider only on later versions + +ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1', +`DAI_CONFIG(SSP, 1, 0, SSP1-Codec, + SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), + SSP_CLOCK(bclk, 2304000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), + SSP_TDM(2, 24, 3, 3), + SSP_CONFIG_DATA(SSP, 1, 24)))', +`DAI_CONFIG(SSP, 1, 0, SSP1-Codec, + SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), + SSP_CLOCK(bclk, 1500000, codec_slave), + SSP_CLOCK(fsync, 46875, codec_slave), + SSP_TDM(2, 16, 3, 3), + SSP_CONFIG_DATA(SSP, 1, 16)))') + +#SSP 0 (ID: 1) +DAI_CONFIG(SSP, 0, 1, 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, 0, 16))) + +# dmic01 (ID: 2) +DAI_CONFIG(DMIC, 0, 2, dmic01, + DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000, + DMIC_WORD_LENGTH(s32le), 400, DMIC, 0, + PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1))) + +# 3 HDMI/DP outputs (ID: 3,4,5) +DAI_CONFIG(HDA, 0, 3, iDisp1) +DAI_CONFIG(HDA, 1, 4, iDisp2) +DAI_CONFIG(HDA, 2, 5, iDisp3) + +# dmic16k (ID: 6) +DAI_CONFIG(DMIC, 1, 6, dmic16k, + DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000, + DMIC_WORD_LENGTH(s32le), 400, DMIC, 1, + PDM_CONFIG(DMIC, 1, STEREO_PDM0))) + +## remove warnings with SST hard-coded routes + +VIRTUAL_WIDGET(ssp5 Tx, out_drv, 0) +VIRTUAL_WIDGET(ssp1 Rx, out_drv, 1) +VIRTUAL_WIDGET(ssp1 Tx, out_drv, 2) +VIRTUAL_WIDGET(iDisp3 Tx, out_drv, 15) +VIRTUAL_WIDGET(iDisp2 Tx, out_drv, 16) +VIRTUAL_WIDGET(iDisp1 Tx, out_drv, 17) +VIRTUAL_WIDGET(DMIC01 Rx, out_drv, 3) +VIRTUAL_WIDGET(dmic01_hifi, out_drv, 5) +VIRTUAL_WIDGET(iDisp3_out, out_drv, 9) +VIRTUAL_WIDGET(iDisp2_out, out_drv, 10) +VIRTUAL_WIDGET(iDisp1_out, out_drv, 11) +VIRTUAL_WIDGET(codec0_out, output, 12) +VIRTUAL_WIDGET(codec1_out, output, 13) +VIRTUAL_WIDGET(codec0_in, input, 14) + +DEBUG_END From ec8b48dab705f2fd5000cfa10e9f977ee3c35de4 Mon Sep 17 00:00:00 2001 From: Sathya Prakash M R Date: Mon, 23 Sep 2019 22:54:50 +0530 Subject: [PATCH 2/2] topology: Add ABI version utilities Some of the features on topology need to have ABI version check. This adds few definitions to check ABI version being 3.9 or more. Signed-off-by: Ranjani Sridharan Signed-off-by: Sathya Prakash M R --- tools/topology/get_abi.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/topology/get_abi.sh b/tools/topology/get_abi.sh index a42a02f99825..5c48ca3b887a 100755 --- a/tools/topology/get_abi.sh +++ b/tools/topology/get_abi.sh @@ -5,6 +5,20 @@ MAJOR=`grep '#define SOF_ABI_MAJOR ' $1/src/include/kernel/abi.h | grep -E ".[[:digit:]]$" -o` MINOR=`grep '#define SOF_ABI_MINOR ' $1/src/include/kernel/abi.h | grep -E ".[[:digit:]]$" -o` PATCH=`grep '#define SOF_ABI_PATCH ' $1/src/include/kernel/abi.h | grep -E ".[[:digit:]]$" -o` +MAJOR_SHIFT=`grep '#define SOF_ABI_MAJOR_SHIFT'\ + $1/src/include/kernel/abi.h | grep -E ".[[:digit:]]$" -o` +MINOR_SHIFT=`grep '#define SOF_ABI_MINOR_SHIFT'\ + $1/src/include/kernel/abi.h | grep -E ".[[:digit:]]$" -o` + +major_val=$(($MAJOR << $MAJOR_SHIFT)) +minor_val=$(($MINOR << $MINOR_SHIFT)) +abi_version_3_8=$((3<<$MAJOR_SHIFT | 8<<$MINOR_SHIFT)) +abi_version=$(($major_val | $minor_val)) +abi_version_3_9_or_greater=$(($abi_version > $abi_version_3_8)) + printf "define(\`SOF_ABI_MAJOR', \`0x%02x')\n" $MAJOR > abi.h printf "define(\`SOF_ABI_MINOR', \`0x%02x')\n" $MINOR >> abi.h printf "define(\`SOF_ABI_PATCH', \`0x%02x')\n" $PATCH >> abi.h +printf "define(\`SOF_ABI_VERSION', \`0x%x')\n" $abi_version >> abi.h +printf "define(\`SOF_ABI_VERSION_3_9_OR_GRT', \`%d')\n"\ + $abi_version_3_9_or_greater >> abi.h