From 15507ec9efbae5897fae9b296e56fc1dd1af63e8 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Mon, 11 Sep 2023 13:36:01 +0300 Subject: [PATCH] topology: Add MICFIL topology for imx8mp Signed-off-by: Daniel Baluta --- tools/topology/topology1/CMakeLists.txt | 1 + tools/topology/topology1/m4/dai.m4 | 2 +- .../topology1/platform/common/micfil.m4 | 24 +++++++++++++ tools/topology/topology1/sof-imx8mp-micfil.m4 | 35 +++++++++++++++++++ tools/topology/topology1/sof/tokens.m4 | 4 +++ 5 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 tools/topology/topology1/platform/common/micfil.m4 create mode 100644 tools/topology/topology1/sof-imx8mp-micfil.m4 diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index 53b440494..4dce10b30 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -185,6 +185,7 @@ set(TPLGS "sof-imx8-wm8960-mixer\;sof-imx8mp-wm8960-mixer\;-DCODEC=wm8960\;-DRATE=48000\;-DSAI_INDEX=3" "sof-imx8-wm8960-mixer\;sof-imx8mp-wm8962-mixer\;-DCODEC=wm8962\;-DRATE=48000\;-DSAI_INDEX=3" "sof-imx8mp-wm8960-kwd\;sof-imx8mp-wm8960-kwd" + "sof-imx8mp-micfil\;sof-imx8mp-micfil" "sof-imx8mp-btsco-dual-8ch\;sof-imx8mp-btsco-dual-8ch" "sof-imx8-wm8960\;sof-imx8mp-wm8960\;-DCODEC=wm8960\;-DRATE=48000\;-DPPROC=volume\;-DSAI_INDEX=3" "sof-imx8-wm8960\;sof-imx8mp-wm8904\;-DCODEC=wm8904\;-DRATE=44100\;-DPPROC=volume\;-DSAI_INDEX=3" diff --git a/tools/topology/topology1/m4/dai.m4 b/tools/topology/topology1/m4/dai.m4 index 8f13db150..e4452c737 100644 --- a/tools/topology/topology1/m4/dai.m4 +++ b/tools/topology/topology1/m4/dai.m4 @@ -155,7 +155,7 @@ define(`DO_DAI_CONFIG', `' ` id "'$3`"' `' -` ifelse($1, `SSP', $5, $1, `HDA', $5, $1, `ALH', $5, $1, `ESAI', $5, $1, `SAI', $5, $1, `AFE', $5, $1, `ACP', $5, $1, `ACPSP', $5, $1,`ACPSP_VIRTUAL', $5, $1, `ACPHS', $5, $1, `ACPHS_VIRTUAL', $5, $1, `ACPDMIC', $5, `}')' +` ifelse($1, `SSP', $5, $1, `HDA', $5, $1, `ALH', $5, $1, `ESAI', $5, $1, `SAI', $5, $1, `MICFIL', $5, $1, `AFE', $5, $1, `ACP', $5, $1, `ACPSP', $5, $1,`ACPSP_VIRTUAL', $5, $1, `ACPHS', $5, $1, `ACPHS_VIRTUAL', $5, $1, `ACPDMIC', $5, `}')' `ifelse($1, `DMIC', $5, `')' `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_common" {' ` tokens "sof_dai_tokens"' diff --git a/tools/topology/topology1/platform/common/micfil.m4 b/tools/topology/topology1/platform/common/micfil.m4 new file mode 100644 index 000000000..0adad8446 --- /dev/null +++ b/tools/topology/topology1/platform/common/micfil.m4 @@ -0,0 +1,24 @@ +divert(-1) + +dnl MICFIL related macros + +define(`MICFIL_CONFIG', +`}' +$1 +) +dnl MICFIL_CONFIG_DATA(type, idx, rate, channel) +define(`MICFIL_CONFIG_DATA', +`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {' +` tokens "sof_micfil_tokens"' +` tuples."word" {' +` SOF_TKN_IMX_MICFIL_RATE' STR($3) +` SOF_TKN_IMX_MICFIL_CH' STR($4) +` }' +`}' +`SectionData."'N_DAI_CONFIG($1$2)`_data" {' +` tuples "'N_DAI_CONFIG($1$2)`_tuples"' +`}' +) + +divert(0)dnl + diff --git a/tools/topology/topology1/sof-imx8mp-micfil.m4 b/tools/topology/topology1/sof-imx8mp-micfil.m4 new file mode 100644 index 000000000..f8bf88bb5 --- /dev/null +++ b/tools/topology/topology1/sof-imx8mp-micfil.m4 @@ -0,0 +1,35 @@ +# +# Topology for i.MX8M with MICFIL found on IMX-AUD-HAT +# + +# Include topology builder +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') +include(`micfil.m4') +# Include TLV library +include(`common/tlv.m4') + +# Include Token library +include(`sof/tokens.m4') + +#Include DSP configuration +include(`platform/imx/imx8.m4') + +#DMIC +# Capture pipeline 3 on PCM 1 using max 4 channels of s32le. +PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, + 1, 0, 4, s32le, + 2000, 0, 0, + 48000, 48000, 48000) + +DAI_ADD(sof/pipe-dai-capture.m4, 1, MICFIL, 2, micfil-dmic-hifi, +PIPELINE_SINK_1, 2, s32le, 2000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) + +dnl DAI_CONFIG(type, dai_index, link_id, name, acpdmic_config) +DAI_CONFIG(MICFIL, 0, 0, micfil-dmic-hifi, + MICFIL_CONFIG(MICFIL_CONFIG_DATA(MICFIL, 0, 48000, 4))) + +# PCM id 1 +PCM_CAPTURE_ADD(MICFIL, 0, PIPELINE_PCM_1) +#/**********************************************************************************/ diff --git a/tools/topology/topology1/sof/tokens.m4 b/tools/topology/topology1/sof/tokens.m4 index 728b7478f..d70ea05cc 100644 --- a/tools/topology/topology1/sof/tokens.m4 +++ b/tools/topology/topology1/sof/tokens.m4 @@ -148,3 +148,7 @@ SectionVendorTokens."sof_acpdmic_tokens" { SOF_TKN_AMD_ACPDMIC_CH "1801" } +SectionVendorTokens."sof_micfil_tokens" { + SOF_TKN_IMX_MICFIL_RATE "2000" + SOF_TKN_IMX_MICFIL_CH "2001" +}