From ac16790f4d7405f29fde39afa100e09c96591f43 Mon Sep 17 00:00:00 2001 From: Pan Xiuli Date: Tue, 21 Apr 2020 12:05:52 +0800 Subject: [PATCH] topology: fix conflict PIPE_VOLUME_PLAYBACK defination in bxt.m4 and sof-hda-generic.m4, they both define the PIPE_VOLUME_PLAYBACK, this will cause wrong tplg result. Refine the them in sof-hda-generic.m4 to PIPE_HEADSET_PLAYBACK to fix the issue. Signed-off-by: Pan Xiuli --- tools/topology/sof-hda-generic.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/topology/sof-hda-generic.m4 b/tools/topology/sof-hda-generic.m4 index 9a412e088297..65087b611458 100644 --- a/tools/topology/sof-hda-generic.m4 +++ b/tools/topology/sof-hda-generic.m4 @@ -30,7 +30,7 @@ include(`platform/intel/intel-generic-dmic.m4') # The pipeline naming notation is pipe-PROCESSING-DIRECTION.m4 # PPROC is set by makefile -define(PIPE_VOLUME_PLAYBACK, `sof/pipe-`PPROC'-playback.m4') +define(PIPE_HEADSET_PLAYBACK, `sof/pipe-`PPROC'-playback.m4') # # Define the pipelines @@ -46,7 +46,7 @@ define(PIPE_VOLUME_PLAYBACK, `sof/pipe-`PPROC'-playback.m4') # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le. # 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(PIPE_VOLUME_PLAYBACK, +PIPELINE_PCM_ADD(PIPE_HEADSET_PLAYBACK, 1, 0, 2, s24le, 1000, 0, 0, 48000, 48000, 48000)