Skip to content

topology: add equalizer to cml rt5682 and hda generic topology #2444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 2 commits into from
Mar 27, 2020
Merged

topology: add equalizer to cml rt5682 and hda generic topology #2444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae73025
topology: add equalizer to cml rt1011 rt5682 topology
fredoh9 Mar 13, 2020
db050ef
topology: add equalizer to hda generic topology
fredoh9 Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions tools/topology/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ set(TPLGS
"sof-cht-max98090\;sof-cht-max98090"
"sof-cht-rt5682\;sof-cht-rt5682"
"sof-cht-src-50khz-pcm512x\;sof-cht-src-50khz-pcm512x"
"sof-hda-generic\;sof-hda-generic\;-DCHANNELS=0"
"sof-hda-generic\;sof-hda-generic-2ch\;-DCHANNELS=2"
"sof-hda-generic\;sof-hda-generic-4ch\;-DCHANNELS=4"
"sof-hda-generic\;sof-hda-generic\;-DCHANNELS=0\;-DPPROC=volume"
"sof-hda-generic\;sof-hda-generic-2ch\;-DCHANNELS=2\;-DPPROC=volume"
"sof-hda-generic\;sof-hda-generic-4ch\;-DCHANNELS=4\;-DPPROC=volume"
"sof-hda-generic\;sof-hda-generic-eq-2ch\;-DCHANNELS=2\;-DPPROC=eq-volume"
"sof-hda-generic\;sof-hda-generic-eq-4ch\;-DCHANNELS=4\;-DPPROC=eq-volume"
"sof-hda-generic-idisp\;sof-hda-generic-idisp\;-DCHANNELS=0"
"sof-hda-generic-idisp\;sof-hda-generic-idisp-2ch\;-DCHANNELS=2"
"sof-hda-generic-idisp\;sof-hda-generic-idisp-4ch\;-DCHANNELS=4"
Expand Down Expand Up @@ -104,7 +106,8 @@ set(TPLGS
"sof-cnl-nocodec\;sof-cnl-nocodec"
"sof-cml-rt5682-max98357a\;sof-cml-rt5682-max98357a\;-DPLATFORM=cml"
"sof-cml-demux-rt5682-max98357a\;sof-cml-demux-rt5682-max98357a\;-DPLATFORM=cml"
"sof-cml-rt1011-rt5682\;sof-cml-rt1011-rt5682\;-DPLATFORM=cml"
"sof-cml-rt1011-rt5682\;sof-cml-rt1011-rt5682\;-DPLATFORM=cml\;-DPPROC=volume"
"sof-cml-rt1011-rt5682\;sof-cml-eq-rt1011-rt5682\;-DPLATFORM=cml\;-DPPROC=eq-volume"
Comment thread
fredoh9 marked this conversation as resolved.
Outdated
"sof-tgl-nocodec\;sof-tgl-nocodec"
"sof-tgl-rt711-i2s-rt1308\;sof-tgl-rt711-i2s-rt1308\;-DHDMI=1"
"sof-tgl-rt711-i2s-rt1308\;sof-tgl-rt711-i2s-rt1308-nohdmi"
Expand Down
6 changes: 5 additions & 1 deletion tools/topology/sof-cml-rt1011-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ DEBUG_START
# PCM5 ----> volume (pipe 7) ----> SSP1 (speaker - rt1011, BE link 5)
#

# The pipeline naming notation is pipe-PROCESSING-DIRECTION.m4
# PPROC is set by makefile
define(PIPE_PROC_PLAYBACK, `sof/pipe-`PPROC'-playback.m4')

dnl PIPELINE_PCM_ADD(pipeline,
dnl pipe id, pcm, max channels, format,
dnl period, priority, core,
Expand All @@ -21,7 +25,7 @@ dnl time_domain, sched_comp)

# Low Latency playback pipeline 7 on PCM 5 using max 2 channels of s32le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
PIPELINE_PCM_ADD(PIPE_PROC_PLAYBACK,
7, 5, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down
6 changes: 5 additions & 1 deletion tools/topology/sof-hda-generic.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ 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 the pipelines
#
Expand All @@ -41,7 +45,7 @@ include(`platform/intel/intel-generic-dmic.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(sof/pipe-volume-playback.m4,
PIPELINE_PCM_ADD(PIPE_VOLUME_PLAYBACK,
1, 0, 2, s24le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down