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

topology: fix bdw codec topology 

Add support for bdw-rt5677
Fix load issue with bdw codec toplogy issue, no SMP support.
Add virtual widgets.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
This commit is contained in:
Pan Xiuli 2019-12-09 14:07:38 +08:00 committed by Liam Girdwood
parent a7bf07a772
commit aa732a37dc
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/topology/CMakeLists.txt
View File

@ -33,6 +33,7 @@ set(TPLGS
"sof-apl-keyword-detect\;sof-apl-keyword-detect"
"sof-bdw-codec\;sof-bdw-rt286\;-DCODEC=RT286"
"sof-bdw-codec\;sof-bdw-rt5640\;-DCODEC=RT5640"
"sof-bdw-codec\;sof-bdw-rt5677\;-DCODEC=RT5677"
"sof-byt-codec\;sof-byt-rt5640\;-DCODEC=RT5640\;-DPLATFORM=byt\;-DSSP_NUM=2"
"sof-byt-codec\;sof-byt-rt5645\;-DCODEC=RT5645\;-DPLATFORM=byt\;-DSSP_NUM=2"
"sof-byt-codec\;sof-byt-rt5651\;-DCODEC=RT5651\;-DPLATFORM=byt\;-DSSP_NUM=2"

15
tools/topology/sof-bdw-codec.m4
View File

@ -1,6 +1,5 @@
#
ifelse(CODEC, `RT286', `# Topology for generic Broadwell board with RT286.', `')
ifelse(CODEC, `RT5640', `# Topology for generic Broadwell board with RT5640.', `')
`# Topology for generic bdw board with' CODEC
#
# Include topology builder
@ -18,8 +17,8 @@ include(`sof/tokens.m4')
# Include Broadwell DSP configuration
include(`platform/intel/bdw.m4')
define(PIPE_NAME, ifelse(CODEC, `RT5640', pipe-bdw-rt5640,
ifelse(CODEC, `RT286', pipe-bdw-rt286, `')))
define(PIPE_NAME, pipe-bdw-`'CODEC`')
#
# Define the pipelines
@ -35,7 +34,7 @@ define(PIPE_NAME, ifelse(CODEC, `RT5640', pipe-bdw-rt5640,
# 1000us deadline on core 0 with priority 1
PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
1, 0, 2, s32le,
1000, 1, 0,
1000, 0, 0,
48000, 48000, 48000)
# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
@ -96,3 +95,9 @@ DAI_CONFIG(SSP, 0, 0, Codec,
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, 25, 3, 3),
SSP_CONFIG_DATA(SSP, 0, 24)))
dnl CODEC is defined and will be expanded, need to undefine it before use
undefine(`CODEC')
VIRTUAL_WIDGET(SSP0 CODEC OUT, output, 0)
VIRTUAL_WIDGET(SSP0 CODEC IN, input, 1)
VIRTUAL_WIDGET(DSP Capture, input, 2)