Skip to content

Commit a6984b8

Browse files
Jyri Sarhakv2019i
authored andcommitted
topology2: dmic-generic.conf: Rename generic DMIC volume
Rename generic DMIC mixer name. Define the associated PCM name in a common place and refer to that name on the mixer name. On cavs-tgl-nocodec.tplg is seen a following mixer name change: 'gain.13.1 DMIC0 Capture Volume 1' > 'gain.13.1 DMIC Capture Volume' Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
1 parent b918e1f commit a6984b8

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

‎tools/topology/topology2/platform/intel/dmic-generic.conf‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Define {
2+
DMIC0_PCM_NAME "DMIC"
3+
}
4+
15
Object.Dai.DMIC [
26
{
37
dai_index 0
@@ -121,7 +125,7 @@ IncludeByKey.PASSTHROUGH {
121125
out_ch_map $CHANNEL_MAP_3_POINT_1
122126
}
123127
Object.Control.mixer.1 {
124-
name 'DMIC0 Capture Volume 1'
128+
name '$DMIC0_PCM_NAME Capture Volume'
125129
}
126130
}
127131

@@ -345,11 +349,11 @@ IncludeByKey.PASSTHROUGH {
345349

346350
Object.PCM.pcm [
347351
{
348-
name "DMIC"
352+
name "$DMIC0_PCM_NAME"
349353
id $DMIC0_PCM_ID
350354
direction "capture"
351355
Object.Base.fe_dai.1 {
352-
name "DMIC"
356+
name "$DMIC0_PCM_NAME"
353357
}
354358

355359
Object.PCM.pcm_caps.1 {

0 commit comments

Comments
 (0)