From f1fa08562d8d24704248dab1c8b0a767cc67f00c Mon Sep 17 00:00:00 2001 From: macchian Date: Tue, 11 Jun 2019 17:02:30 +0800 Subject: [PATCH 1/3] tplg: add tplg file for CML with da7219 + max98357 add the topology file for Cometlake with analog codec da7219 on SSP0 for headphone playback/headset mic with digital codec max98357 on SSP1 for speaker playback --- tools/topology/CMakeLists.txt | 81 ++--------- tools/topology/sof-cml-da7219-max98357a.m4 | 60 ++++++++ tools/topology/sof-cml-da7219.m4 | 156 +++++++++++++++++++++ 3 files changed, 230 insertions(+), 67 deletions(-) create mode 100644 tools/topology/sof-cml-da7219-max98357a.m4 create mode 100644 tools/topology/sof-cml-da7219.m4 diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index b225dd000970..dfdbc222da0c 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -1,71 +1,18 @@ -file(GLOB TPLG_DEPS - platform/intel/*.m4 - platform/common/*.m4 - common/*.m4 - m4/*.m4 - sof/*.m4 -) +cmake_minimum_required(VERSION 3.10) -set(MACHINES - sof-cht-nocodec - sof-cht-max98090 - sof-hda-intel-common - sof-apl-nocodec - sof-byt-nocodec - sof-bdw-rt286 - sof-bdw-rt5640 - sof-byt-rt5640 - sof-byt-rt5645 - sof-byt-rt5651 - sof-byt-da7213 - sof-cnl-rt274 - sof-hsw-rt5640 - sof-apl-tdf8532 - sof-apl-pcm512x - sof-apl-pcm512x-nohdmi - sof-apl-rt298 - sof-apl-wm8804 - sof-apl-da7219 - sof-glk-da7219 - sof-glk-rt5682 - sof-icl-nocodec - sof-apl-eq-pcm512x - sof-apl-eq-dmic - sof-apl-dmic-2ch - sof-apl-dmic-4ch - sof-icl-dmic-4ch - sof-apl-src-pcm512x - sof-cml-rt5682 - sof-whl-rt5682 - sof-cml-src-rt5682 - sof-cnl-nocodec -) - -add_custom_target(topologies ALL) - -foreach(machine ${MACHINES}) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${machine}.conf - COMMAND m4 - -I ${CMAKE_CURRENT_SOURCE_DIR}/m4 - -I ${CMAKE_CURRENT_SOURCE_DIR}/common - -I ${CMAKE_CURRENT_SOURCE_DIR}/platform/common - -I ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/${machine}.m4 - > ${machine}.conf - DEPENDS ${TPLG_DEPS} - VERBATIM - USES_TERMINAL +if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") + message(FATAL_ERROR + " In-source builds are not supported.\n" + " Please remove CMakeCache.txt and the CMakeFiles directory.\n" + " Then specify a build directory. Example: cmake -Bbuild ..." ) +endif() - add_custom_command( - OUTPUT ${machine}.tplg - COMMAND alsatplg -v 1 -c ${machine}.conf -o ${machine}.tplg - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${machine}.conf - VERBATIM - USES_TERMINAL - ) +project(SOF_TOOLS C) + +set(SOF_ROOT_SOURCE_DIRECTORY "${PROJECT_SOURCE_DIR}/..") - add_custom_target(topology_${machine} DEPENDS ${machine}.tplg) - add_dependencies(topologies topology_${machine}) -endforeach() +add_subdirectory(logger) +add_subdirectory(eqctl) +add_subdirectory(topology) +add_subdirectory(test) diff --git a/tools/topology/sof-cml-da7219-max98357a.m4 b/tools/topology/sof-cml-da7219-max98357a.m4 new file mode 100644 index 000000000000..c896293e721f --- /dev/null +++ b/tools/topology/sof-cml-da7219-max98357a.m4 @@ -0,0 +1,60 @@ +# +# Topology for Cometlake with da7219 headset on SSP0, max98357a spk on SSP1 +# +# Adding max98357a spk on SSP1 on top of sof-cml-da7219. +# + +# Include SOF CML DA7219 Topology +# This includes topology for DA7219, DMIC and 3 HDMI Pass through pipeline +include(`sof-cml-da7219.m4') + +DEBUG_START +# +# Define the Speaker pipeline +# +# PCM5 ----> volume (pipe 7) ----> SSP1 (speaker - maxim98357a, BE link 5) +# + +dnl PIPELINE_PCM_ADD(pipeline, +dnl pipe id, pcm, max channels, format, +dnl frames, deadline, priority, core) + +# Low Latency playback pipeline 7 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-src-playback.m4, + 7, 1, 2, s32le, + 48, 1000, 0, 0) + +# +# Speaker 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 s16le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 7, SSP, 1, SSP1-Codec, + PIPELINE_SOURCE_7, 2, s16le, + 48, 1000, 0, 0) + +# PCM Low Latency, id 0 +dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) +PCM_PLAYBACK_ADD(Speakers, 1, PIPELINE_PCM_7) + +# +# BE configurations for Speakers - overrides config in ACPI if present +# + +#SSP 1 (ID: 1) +DAI_CONFIG(SSP, 1, 1, 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))) + +DEBUG_END diff --git a/tools/topology/sof-cml-da7219.m4 b/tools/topology/sof-cml-da7219.m4 new file mode 100644 index 000000000000..4b1b8ecb66ea --- /dev/null +++ b/tools/topology/sof-cml-da7219.m4 @@ -0,0 +1,156 @@ +# +# Topology for Cometlake with da7219 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 <----> SSP0 +# 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, s32le, + 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, 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 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, + 4, 3, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 5 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, + 5, 4, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 6 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, + 6, 5, 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 SSP0 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, 0, SSP0-Codec, + PIPELINE_SOURCE_1, 2, s16le, + 48, 1000, 0, 0) + +# capture DAI is SSP0 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, 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) + +# 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(Headset, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) +PCM_CAPTURE_ADD(DMIC01, 2, PIPELINE_PCM_3) +PCM_PLAYBACK_ADD(HDMI1, 3, PIPELINE_PCM_4) +PCM_PLAYBACK_ADD(HDMI2, 4, PIPELINE_PCM_5) +PCM_PLAYBACK_ADD(HDMI3, 5, PIPELINE_PCM_6) + +# +# BE configurations - overrides config in ACPI if present +# + +#SSP 0 (ID: 0) +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, 0, 16))) + +# dmic01 (ID: 2) +DAI_CONFIG(DMIC, 0, 2, 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: 3,4,5) +DAI_CONFIG(HDA, 0, 3, iDisp1) +DAI_CONFIG(HDA, 0, 4, iDisp2) +DAI_CONFIG(HDA, 0, 5, iDisp3) + + +DEBUG_END From 40ca534111b7158fdfa6ed896174d9bbc0c446f9 Mon Sep 17 00:00:00 2001 From: macchian Date: Tue, 11 Jun 2019 17:23:14 +0800 Subject: [PATCH 2/3] Delete CMakeLists.txt upload wrong file --- tools/topology/CMakeLists.txt | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 tools/topology/CMakeLists.txt diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt deleted file mode 100644 index dfdbc222da0c..000000000000 --- a/tools/topology/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") - message(FATAL_ERROR - " In-source builds are not supported.\n" - " Please remove CMakeCache.txt and the CMakeFiles directory.\n" - " Then specify a build directory. Example: cmake -Bbuild ..." - ) -endif() - -project(SOF_TOOLS C) - -set(SOF_ROOT_SOURCE_DIRECTORY "${PROJECT_SOURCE_DIR}/..") - -add_subdirectory(logger) -add_subdirectory(eqctl) -add_subdirectory(topology) -add_subdirectory(test) From acd89bbbd3fb2dc224e4d24bb984adda85d7bb22 Mon Sep 17 00:00:00 2001 From: macchian Date: Tue, 11 Jun 2019 17:53:06 +0800 Subject: [PATCH 3/3] add da7219, max98357 in MakeList --- tools/topology/CMakeLists.txt | 73 +++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 tools/topology/CMakeLists.txt diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt new file mode 100644 index 000000000000..a97af97d9772 --- /dev/null +++ b/tools/topology/CMakeLists.txt @@ -0,0 +1,73 @@ +file(GLOB TPLG_DEPS + platform/intel/*.m4 + platform/common/*.m4 + common/*.m4 + m4/*.m4 + sof/*.m4 +) + +set(MACHINES + sof-cht-nocodec + sof-cht-max98090 + sof-hda-intel-common + sof-apl-nocodec + sof-byt-nocodec + sof-bdw-rt286 + sof-bdw-rt5640 + sof-byt-rt5640 + sof-byt-rt5645 + sof-byt-rt5651 + sof-byt-da7213 + sof-cnl-rt274 + sof-hsw-rt5640 + sof-apl-tdf8532 + sof-apl-pcm512x + sof-apl-pcm512x-nohdmi + sof-apl-rt298 + sof-apl-wm8804 + sof-apl-da7219 + sof-glk-da7219 + sof-glk-rt5682 + sof-icl-nocodec + sof-apl-eq-pcm512x + sof-apl-eq-dmic + sof-apl-dmic-2ch + sof-apl-dmic-4ch + sof-icl-dmic-4ch + sof-apl-src-pcm512x + sof-cml-rt5682 + sof-whl-rt5682 + sof-cml-src-rt5682 + sof-cnl-nocodec + sof-cml-da7219 + sof-cml-da7219-max98357a +) + +add_custom_target(topologies ALL) + +foreach(machine ${MACHINES}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${machine}.conf + COMMAND m4 + -I ${CMAKE_CURRENT_SOURCE_DIR}/m4 + -I ${CMAKE_CURRENT_SOURCE_DIR}/common + -I ${CMAKE_CURRENT_SOURCE_DIR}/platform/common + -I ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/${machine}.m4 + > ${machine}.conf + DEPENDS ${TPLG_DEPS} + VERBATIM + USES_TERMINAL + ) + + add_custom_command( + OUTPUT ${machine}.tplg + COMMAND alsatplg -v 1 -c ${machine}.conf -o ${machine}.tplg + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${machine}.conf + VERBATIM + USES_TERMINAL + ) + + add_custom_target(topology_${machine} DEPENDS ${machine}.tplg) + add_dependencies(topologies topology_${machine}) +endforeach()