From 2abef019d35ba61e519bbb7d1739f5758b170eee Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Thu, 24 Feb 2022 20:45:41 -0800 Subject: [PATCH] topology2: intel: dmic-generic: Add a few more variables Add a few more variables to make the dmic-generic topology more configurable. Signed-off-by: Ranjani Sridharan --- .../cavs/platform/intel/dmic-generic.conf | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/topology/topology2/cavs/platform/intel/dmic-generic.conf b/tools/topology/topology2/cavs/platform/intel/dmic-generic.conf index 8901b1edd..cc4e03939 100644 --- a/tools/topology/topology2/cavs/platform/intel/dmic-generic.conf +++ b/tools/topology/topology2/cavs/platform/intel/dmic-generic.conf @@ -10,11 +10,14 @@ Define { DMIC0_DAI_PIPELINE_ID 12 DMIC0_HOST_PIPELINE_SINK "copier.host.11.1" DMIC0_DAI_PIPELINE_SRC "copier.DMIC.12.1" + DMIC0_NAME dmic01 + DMIC0_PCM_CAPS "Passthrough Capture 11" + DMIC0_PIPELINE_STREAM_NAME "copier.DMIC.12.1" } Object.Dai { DMIC.0 { - name dmic01 + name $DMIC0_NAME id $DMIC0_ID driver_version $DMIC_DRIVER_VERSION io_clk $DMIC_IO_CLK @@ -48,10 +51,10 @@ Object.Pipeline { format $FORMAT index $DMIC0_HOST_PIPELINE_ID Object.Widget.pipeline.1 { - stream_name 'copier.DMIC.12.1' + stream_name $DMIC0_PIPELINE_STREAM_NAME } Object.Widget.copier.1 { - stream_name 'Passthrough Capture 11' + stream_name $DMIC0_PCM_CAPS } } @@ -60,7 +63,7 @@ Object.Pipeline { format $FORMAT index $DMIC0_DAI_PIPELINE_ID Object.Widget.pipeline.1 { - stream_name 'copier.DMIC.12.1' + stream_name $DMIC0_PIPELINE_STREAM_NAME } Object.Widget.copier.1 { @@ -69,7 +72,7 @@ Object.Pipeline { dai_type "DMIC" copier_type "DMIC" type dai_out - stream_name "dmic01" + stream_name $DMIC0_NAME node_type $DMIC_LINK_INPUT_CLASS Object.Base.audio_format.1 { in_bit_depth 32 @@ -95,7 +98,7 @@ Object.PCM { Object.Base.fe_dai."DMIC" {} Object.PCM.pcm_caps."capture" { - name "Passthrough Capture 11" + name $DMIC0_PCM_CAPS # only 32-bit capture supported now formats 'S32_LE' }