OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <xiuli.pan@linux.intel.com>
This commit is contained in:
Pan Xiuli 2020-04-21 12:05:52 +08:00 committed by Liam Girdwood
parent ab0c9e046d
commit 7d9ea989d7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/topology/sof-hda-generic.m4
View File

@ -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)