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

64 lines
1.7 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 : update max98357a configuration in CML With m/n divider support, we can now support 24 bit/ 48k on max98357a. Add check to only use update BCLK if m/n support is present. Else fallback to older settings. Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-09-24 01:26:48 +08:00
include(`abi.h')
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)
#
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
dnl PIPELINE_PCM_ADD(pipeline,
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
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,
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
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
topology: move ifelse conditions to platform files Move platform specific conditions to each platform file. Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
2020-03-12 05:02:10 +08:00
PIPELINE_PCM_ADD(PIPE_VOLUME_PLAYBACK,
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: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
1000, 0, 0,
topology: move ifelse conditions to platform files Move platform specific conditions to each platform file. Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
2020-03-12 05:02:10 +08:00
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: cml: cnl: use 3 periods for SSP, DMIC and ALH DAIs Changes number of SSP, DMIC and ALH DAI periods from 2 to 3. This way we can support both timer and new single DMA channel scheduling. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-09-20 16:18:36 +08:00
dnl deadline, priority, core, time_domain)
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 : update max98357a configuration in CML With m/n divider support, we can now support 24 bit/ 48k on max98357a. Add check to only use update BCLK if m/n support is present. Else fallback to older settings. Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-09-24 01:26:48 +08:00
topology: move ifelse conditions to platform files Move platform specific conditions to each platform file. Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
2020-03-12 05:02:10 +08:00
DAI_ADD(sof/pipe-dai-playback.m4,
7, SSP, SSP1_INDEX, SSP1_NAME,
PIPELINE_SOURCE_7, 2, SSP1_VALID_BITS_STR,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
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)
topology : update max98357a configuration in CML With m/n divider support, we can now support 24 bit/ 48k on max98357a. Add check to only use update BCLK if m/n support is present. Else fallback to older settings. Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
2019-09-24 01:26:48 +08:00
# Use BCLK derived using m/n divider only on later versions
topology: move ifelse conditions to platform files Move platform specific conditions to each platform file. Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
2020-03-12 05:02:10 +08:00
DAI_CONFIG(SSP, SSP1_INDEX, 6, SSP1_NAME,
SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP1_MCLK_RATE, codec_mclk_in),
Revert "topologies: switch all .m4 files to codec_provider and codec_consumer" This reverts commit f50b6fe0adc440a5b0d93054372adec74f0a013f. I discovered the hard way that this change causes alsatplg version 1.2.2 (the default version in the current LTS Ubuntu) to corrupt just a few bytes in .tplg output in an incredibly discrete and time-consuming way: no error message at build time and same file size. See example at https://github.com/thesofproject/sof/pull/5162. We could/should just require a minimum alsatplg version at the CMake level but at this moment we don't even know which minimum version is needed and we would also need to take some time to test a few alsatplg versions. If version 1.2.2 would just fail with an decent error message that can be searched and discussed then everything would be fine but silent corruption is really not OK. So users of recent versions will unfortunately have to live with the huge number of warnings for now. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2022-01-12 09:43:56 +08:00
SSP_CLOCK(bclk, SSP1_BCLK, codec_slave),
SSP_CLOCK(fsync, SSP1_FSYNC, codec_slave),
topology: move ifelse conditions to platform files Move platform specific conditions to each platform file. Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
2020-03-12 05:02:10 +08:00
SSP_TDM(2, SSP1_VALID_BITS, 3, 3),
SSP_CONFIG_DATA(SSP, SSP1_INDEX, SSP1_VALID_BITS)))
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_END