OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
sof/tools/topology/sof-cml-rt5682-max98357a.m4

64 lines
1.6 KiB
Plaintext
Raw Normal View History

topology: Add CML topology support for rt5682+max98357a variant Add max98357a speaker on top of sof-rt5682 CML Audio topology Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-03-18 20:10:06 +08:00
#
# Topology for Cometlake with rt5682 headset on SSP0, max98357a spk on SSP1
#
# Adding max98357a spk on SSP1 on top of sof-cml-rt5682.
#
# Include SOF CML RT5682 Topology
# This includes topology for RT5682, DMIC and 3 HDMI Pass through pipeline
topology: sof-cml-rt5682-max98357a: switch to use kwd pipelines Switch to use sof-cml-rt5682-kwd.m4 which can support Keyword Detect feature. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-10 16:50:26 +08:00
include(`sof-cml-rt5682-kwd.m4')
topology: Add CML topology support for rt5682+max98357a variant Add max98357a speaker on top of sof-rt5682 CML Audio topology Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-03-18 20:10:06 +08:00
DEBUG_START
#
# Define the Speaker pipeline
#
# PCM5 ----> volume (pipe 7) ----> SSP1 (speaker - maxim98357a, BE link 5)
#
dnl PIPELINE_PCM_ADD(pipeline,
dnl pipe id, pcm, max channels, format,
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
dnl period, priority, core,
dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)
topology: Add CML topology support for rt5682+max98357a variant Add max98357a speaker on top of sof-rt5682 CML Audio topology Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-03-18 20:10:06 +08:00
# Low Latency playback pipeline 7 on PCM 5 using max 2 channels of s32le.
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
# Set 1000us deadline on core 0 with priority 0
Topology: Rename pipe-src-playback.m4 macro This patch renames the macro to pipe-src-volume-playback.m4 for consistency with other audio processing plus volume pipelines. The topologies those use it are modified for the new file name. A new macro for testbench usage called pipe-src-playback.m4 is added. It is plain SRC component pipeline without volume. The volume component in the pipeline caused difficulties with test. The script tools/test/topology/tplg-build.sh will use the pipeline to create test topology for SRC component. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-05-10 23:31:39 +08:00
PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4,
topology: Add CML topology support for rt5682+max98357a variant Add max98357a speaker on top of sof-rt5682 CML Audio topology Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-03-18 20:10:06 +08:00
7, 5, 2, s32le,
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
1000, 0, 0,
48000, 48000, 48000)
topology: Add CML topology support for rt5682+max98357a variant Add max98357a speaker on top of sof-rt5682 CML Audio topology Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-03-18 20:10:06 +08:00
#
# Speaker DAIs configuration
#
dnl DAI_ADD(pipeline,
dnl pipe id, dai type, dai_index, dai_be,
dnl buffer, periods, format,
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
dnl deadline, priority, core)
topology: Add CML topology support for rt5682+max98357a variant Add max98357a speaker on top of sof-rt5682 CML Audio topology Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-03-18 20:10:06 +08:00
# playback DAI is SSP1 using 2 periods
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
topology: Add CML topology support for rt5682+max98357a variant Add max98357a speaker on top of sof-rt5682 CML Audio topology Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-03-18 20:10:06 +08:00
DAI_ADD(sof/pipe-dai-playback.m4,
7, SSP, 1, SSP1-Codec,
PIPELINE_SOURCE_7, 2, s16le,
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
1000, 0, 0)
topology: Add CML topology support for rt5682+max98357a variant Add max98357a speaker on top of sof-rt5682 CML Audio topology Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-03-18 20:10:06 +08:00
# PCM Low Latency, id 0
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
PCM_PLAYBACK_ADD(Speakers, 5, PIPELINE_PCM_7)
#
# BE configurations for Speakers - overrides config in ACPI if present
#
topology: sof-cml-rt5682-max98357a: change BE id to align with machine driver The BE id for amplifier pipeline should be changed to 6 to align with machine driver (The commit ASoC: Intel: sof-rt5682: correct naming for dmic16k). Cc: Sathya Prakash M R <sathya.prakash.m.r@intel.com> Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-10 15:49:46 +08:00
#SSP 1 (ID: 6)
DAI_CONFIG(SSP, 1, 6, SSP1-Codec,
topology: Add CML topology support for rt5682+max98357a variant Add max98357a speaker on top of sof-rt5682 CML Audio topology Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-03-18 20:10:06 +08:00
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
SSP_CLOCK(bclk, 1500000, codec_slave),
SSP_CLOCK(fsync, 46875, codec_slave),
SSP_TDM(2, 16, 3, 3),
SSP_CONFIG_DATA(SSP, 1, 16)))
DEBUG_END