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

topology: fix dai capture tokens and move buffer size macro definition 

This patch fixes typo in dai capture tokens and moves te buffer size
macro definition to buffer.m4

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2018-03-06 10:59:03 -08:00 committed by Liam Girdwood
parent 59bcff216a
commit 3105de2481
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
topology/dsps/bdw.m4
View File

@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "
W_DATA(dai0p_plat_conf, dai0p_plat_tokens) W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
# DAI0 platform capture configuration # DAI0 platform capture configuration
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
W_DATA(dai0c_plat_conf, dai0c_plat_tokens) W_DATA(dai0c_plat_conf, dai0c_plat_tokens)

2
topology/dsps/bxt.m4
View File

@ -34,7 +34,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "
W_DATA(dai0p_plat_conf, dai0p_plat_tokens) W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
# DAI0 platform capture configuration # DAI0 platform capture configuration
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
W_DATA(dai0c_plat_conf, dai0c_plat_tokens) W_DATA(dai0c_plat_conf, dai0c_plat_tokens)

2
topology/dsps/byt.m4
View File

@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "
W_DATA(dai0p_plat_conf, dai0p_plat_tokens) W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
# DAI0 platform capture configuration # DAI0 platform capture configuration
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
W_DATA(dai0c_plat_conf, dai0c_plat_tokens) W_DATA(dai0c_plat_conf, dai0c_plat_tokens)

2
topology/dsps/cht.m4
View File

@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "
W_DATA(dai0p_plat_conf, dai0p_plat_tokens) W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
# DAI0 platform capture configuration # DAI0 platform capture configuration
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
W_DATA(dai0c_plat_conf, dai0c_plat_tokens) W_DATA(dai0c_plat_conf, dai0c_plat_tokens)

2
topology/dsps/cnl.m4
View File

@ -35,7 +35,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "
W_DATA(dai0p_plat_conf, dai0p_plat_tokens) W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
# DAI0 platform capture configuration # DAI0 platform capture configuration
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
W_DATA(dai0c_plat_conf, dai0c_plat_tokens) W_DATA(dai0c_plat_conf, dai0c_plat_tokens)

2
topology/dsps/hsw.m4
View File

@ -31,7 +31,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "
W_DATA(dai0p_plat_conf, dai0p_plat_tokens) W_DATA(dai0p_plat_conf, dai0p_plat_tokens)
# DAI0 platform capture configuration # DAI0 platform capture configuration
W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC "1"')) W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"'))
W_DATA(dai0c_plat_conf, dai0c_plat_tokens) W_DATA(dai0c_plat_conf, dai0c_plat_tokens)

22
topology/m4/buffer.m4
View File

@ -26,4 +26,26 @@ define(`W_BUFFER',
` ]' ` ]'
`}') `}')
dnl COMP_BUFFER_SIZE( num_periods, sample_size, channels, fmames)
define(`COMP_BUFFER_SIZE', `eval(`$1 * $2 * $3 * $4')')
dnl PCM_PLAYBACK_ADD(name, pipeline, pcm_id, dai_id, playback)
define(`PCM_PLAYBACK_ADD',
`SectionPCM.STR($1) {'
`'
` index STR($2)'
`'
` # used for binding to the PCM'
` id STR($3)'
`'
` dai.STR($1 $3) {'
` id STR($4)'
` }'
`'
` pcm."playback" {'
`'
` capabilities STR($5)'
` }'
`}')
divert(0)dnl divert(0)dnl

22
topology/m4/pcm.m4
View File

@ -93,28 +93,6 @@ define(`PCM_CAPABILITIES',
` buffer_size_max STR($12)' ` buffer_size_max STR($12)'
`}') `}')
dnl COMP_BUFFER_SIZE( num_periods, sample_size, channels, fmames)
define(`COMP_BUFFER_SIZE', `eval(`$1 * $2 * $3 * $4')')
dnl PCM_PLAYBACK_ADD(name, pipeline, pcm_id, dai_id, playback)
define(`PCM_PLAYBACK_ADD',
`SectionPCM.STR($1) {'
`'
` index STR($2)'
`'
` # used for binding to the PCM'
` id STR($3)'
`'
` dai.STR($1 $3) {'
` id STR($4)'
` }'
`'
` pcm."playback" {'
`'
` capabilities STR($5)'
` }'
`}')
dnl PCM_CAPTURE_ADD(name, pipeline, pcm_id, dai_id, capture) dnl PCM_CAPTURE_ADD(name, pipeline, pcm_id, dai_id, capture)
define(`PCM_CAPTURE_ADD', define(`PCM_CAPTURE_ADD',
`SectionPCM.STR($1) {' `SectionPCM.STR($1) {'