Commit Graph

141 Commits

Author SHA1 Message Date
Wu Zhigang 2cc3ad2a92 topology: 8-channel should be supported
8 channels should be supported.

Signed-off-by: Wu Zhigang <zhigang.wu@linux.intel.com>
Suggested-by: Keyon Jie <yang.jie@linux.intel.com>
2018-06-11 12:11:16 +01:00
Wu Zhigang f85f5f8e38 topology: enable ssp2 for capture feature.
the ssp2 should be tdm8-32bit.

Signed-off-by: Wu Zhigang <zhigang.wu@linux.intel.com>
2018-06-11 12:11:16 +01:00
Pan Xiuli 5a59eca380 topology: test: Fix tplb-build.sh when did no use XARGS
Miss TFILE when not using XARGS.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-06-04 09:29:08 +01:00
Ranjani Sridharan 07d290c8ac topology: add DMIC dai support in test capture m4
Add support for adding DMIC config for DMIC DAI type.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-31 21:21:38 +01:00
Ranjani Sridharan 082f9714a9 topology: add DMIC config definition to DAI config
This patch adds the DMIC config definition and the DMIC
config entry in DAI config.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-31 21:21:38 +01:00
Ranjani Sridharan d6e201c961 topology: scripts: add dmic test topology
This patch adds the dmic test case to the tplg generating script.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-31 21:21:38 +01:00
Ranjani Sridharan 1dcac3225e topology: make m4 filenames dai type agnostic
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-31 21:21:38 +01:00
Ranjani Sridharan a913f77e65 topology: add DMIC tokens
This patch introduces the DMIC specific config parameter tokens
in topology.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-31 21:21:38 +01:00
Ranjani Sridharan 56b8316e2a topology: separate ssp params from dai common params
This patch makes changes to DAI config in topology to separate out
SSP specific params from common params in preparation for other
DAI types coming soon.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-31 21:21:38 +01:00
Ranjani Sridharan e77a8ef269 topology: scripts: changes to accommodate different DAI types
This patch makes the following changes to make way for handling
different DAI types in tplg build script:

1. Define the test DAI type while processing m4 files
2. DAI format and DAI port might be relevant for other types of DAI's.
So use generic TEST_DAI_PORT and TEST_DAI_FORMAT instead of
TEST_SSP_PORT TEST_SSP_FORMAT

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-31 21:21:38 +01:00
Ranjani Sridharan 21f523401e topology:scripts: fix tplg build script to compile last topology when using xargs
When using xargs, the last topology file while batch processing alsatplg
doesn't get compiled properly.

Also remove a stray ; in the script.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-31 21:21:31 +01:00
Keyon Jie 0876e73f31 Topology: sof-apl-tdf8532: enable all 6 SSPs and pipelines.
Todo: to confirm and refine settings for each SSP/dai.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-05-31 16:55:58 +01:00
Keyon Jie 885ae37f49 topology: bxt: change to use dmac0 for capture
Otherwise, the channels may be used up when pipeline number > 8.

Todo: remove dmac definition from tplg, just allocate them inside
firmware.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-05-31 16:55:58 +01:00
Keyon Jie ed471edb8f topology: dai: add link_id for dai_link matching in DAI_CONFIG
This is used for the matching with snd_soc_dai_link.id in BE dai_links.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-05-31 16:48:45 +01:00
Ranjani Sridharan ed3f3aa94a topology: tone pipeline should be DAI driver and not timer driven
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-31 08:48:28 +01:00
Keyon Jie 7ee114d2ed topology: sof-apl-tdf8532: add virtual widgets and routes
Add virtual widgets and routes to make it aligned with machine driver.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-05-24 12:31:19 +02:00
Keyon Jie 2c31bbdc20 topology: change virtual widget types to non-DSP ones
This means they won't be sent to firmware for components creation.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-05-24 12:31:19 +02:00
Ranjani Sridharan 28ab096452 topology: scripts: modify simple_test function to be generic and remove tone_test function
Make simple_test function generic by accepting the array of
test cases as an argument. The tone_test function can
be removed and replaced with the modified simple_test function
and passing the required test case to generate the tone
topology file.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-22 08:50:30 +01:00
Ranjani Sridharan 04691ffbe5 topology: add ssp tokens defined in kernel UAPI header
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-22 08:30:20 +01:00
Rander Wang 35420bec93 topology: add virtual dapm route supported in topology file
To reuse some machine drivers in Linux kernel without hacking
dapm route info, some unsupported routes and widgets could be
added in toplogy file.

Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
2018-05-18 11:31:48 +01:00
Zhang Keqiao 86fe688a2b topology: test: add some passthrough topologies for CNL
Signed-off-by: Zhang Keqiao <keqiao.zhang@linux.intel.com>
2018-05-07 14:10:59 +01:00
Ranjani Sridharan d0f4aba934 topology: speed up topology build
Speed up topology with batch processing of m4 files

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-05-07 11:55:47 +01:00
Pierre-Louis Bossart 13b56fa604 topology: mirror alsa-lib definitions for mclk/bclk
ALSA-lib introduced new definitions to work around an logical
inversion for master/slave definitions. see e.g. commit 3778a30bb00
('ASoC: topology: Fix bclk and fsync inversion in
set_link_hw_format()')

Make sure clarifications are reflected in the topology files
bclk/fsync slave -> codec_slave
mclk slave -> codec_mclk_in

This patch requires the use of the latest alsa-lib git master (v1.1.6
does not contain the relevant patches).
This patch also requires an updated kernel.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2018-04-30 16:56:51 +01:00
Pierre-Louis Bossart 6ad7a30c76 topology: test: fix APL test loops
Copy/paste mistake, fix.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2018-04-13 19:51:21 +01:00
Pierre-Louis Bossart 935161d09f topology: test: generate more configurations for ApolloLake
Disk space is cheap, life is short, let's just brute-force generate
all the combinations supported on SSP. Testers should just pick from
the generated configurations instead of adding their own changes to
the tplg-build.sh file.

Passthrough is special-cased since pipeline and DAI format need to
match.

The frequencies and DAI formats remain in clear-text and duplicated,
we could optimize further but then it'd become unmaintainable.

Next step is to add slave mode and make the frame rate vary.

If this is deemed to heavy, we can define a 'make test' target to
avoid generating all these files by default. Alternatively people can select the modes needed by just changing the APL_ arrays.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2018-04-13 15:53:27 +01:00
Liam Girdwood 4f6d459586 topology: rename topologies to use sof prefix
Use sof- prefix instead of reef-

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-04-13 14:47:25 +01:00
Keqiao.Zhang 8e8cd884c3 Makefile: fix the make clean issue at the top-level directory
make clean done at the top-level does not clean the topology/test
directory, use clean-local instead of clean

Signed-off-by: Keqiao.Zhang <keqiao.zhang@linux.intel.com>
2018-04-11 19:41:26 +01:00
Keqiao.Zhang c0857f17fa dist: fix make dist for tone topology M4
Signed-off-by: Keqiao.Zhang <keqiao.zhang@linux.intel.com>
2018-04-11 19:37:30 +01:00
Liam Girdwood 4b8d6b5c60 dist: fix make dist for topology M4
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-04-05 11:22:05 +01:00
Liam Girdwood 99c09871a8 topology: bdw-rt5640: Fix BE DAI name to match legacy driver
Now matches legacy driver.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-30 14:24:03 +01:00
Liam Girdwood 90e3a38439 Revert "topology: reef-apl-nocodec: use SSP4 for playback and SSP2 for both"
This reverts commit 0d63b75d1e.

Needs multi DAI support scheduled for 1.2

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-30 14:12:54 +01:00
Keqiao.Zhang e2c5794d6d topology: test: remove 2 unsupported passthrough tplg
Signed-off-by: Keqiao.Zhang <keqiao.zhang@linux.intel.com>
2018-03-30 10:32:26 +01:00
Keqiao.Zhang 2bd31df02b topology: test: add different ssp modes of topologies for test
Signed-off-by: Keqiao.Zhang <keqiao.zhang@linux.intel.com>
2018-03-30 10:30:02 +01:00
Keqiao.Zhang 3c71cf866c topology: ssp: add TEST_SSP_MODE for ssp to support more modes
Signed-off-by: Keqiao.Zhang <keqiao.zhang@linux.intel.com>
2018-03-30 10:29:18 +01:00
Keyon Jie 739acd1e5e topology: apl-tdf8532: add support for SSP2-Codec
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-03-28 16:52:35 +01:00
Keyon Jie 0d63b75d1e topology: reef-apl-nocodec: use SSP4 for playback and SSP2 for both
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-03-28 14:35:38 +01:00
Keyon Jie 30aaefaea0 topology: pcm: add pipeline_id for stream name to avoid duplicate
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-03-28 14:35:38 +01:00
Keyon Jie 73a454544c topology: append pipeline id to PGA and control mixer
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-03-28 14:35:38 +01:00
Liam Girdwood 49c1b450e6 topology: hsw/bdw: Use DMAC1 for host DMA
DMAC0 missing some configuration so use DMAC1

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-23 21:44:25 +00:00
Ranjani Sridharan 0f9612cf9d topology: modify tlv data to match volume range supported by firmware
This patch modifies the tlv data for volume controls to match
the volume range supported in the firmware.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-23 11:37:04 +00:00
Pan Xiuli b799e3fa3b topology: modify passthrough pipelien PCM capabilities
For passthrough PCM, we can only support the SSP DAI format as
PCM capabilities.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-03-22 12:35:03 +00:00
Pan Xiuli 277b7a011a topology: utils: add get format name helper function
We may need to get format name from some format short name.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-03-22 12:35:03 +00:00
Keqiao.Zhang 149d7c36ea topology: test: add more topologies for test
Signed-off-by: Keqiao.Zhang <keqiao.zhang@linux.intel.com>
2018-03-22 12:31:59 +00:00
Wu Zhigang b77473c0b2 topology: apl-tdf8532: create m4 file for gpmrb platform
Here add topology file for apollolake GP-MRB platform,
it is initial version, we only support one playback
and one capture PCM pipeline at the moment,
with SSP/DAI set to tdm8-32le-48kHz
(active on first 4 slots for both transmit and receive).

Signed-off-by: Wu Zhigang <zhigang.wu@linux.intel.com>

Reviewed-by: Keyon Jie <yang.jie@linux.intel.com>
2018-03-21 17:09:12 +00:00
Pan Xiuli 105c88febf topology: Remove duplicate W_DAI_IN/OUT and W_PIPELINE
We call PIPELINE_PCM_DAI_ADD and DAI_ADD that will duplicate call
W_DAI_IN/OUT and W_PIPELINE.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-03-21 13:36:58 +00:00
Liam Girdwood dbd15bb847 topology: media: fix incorrect pipeline ID for media PCM
Missing include for pcm.m4

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-17 20:33:07 +00:00
Liam Girdwood cc91c73aa3 topology: pcm: Fix PCM ID for topologies > 1 PCM
PCM number was not being preserved and was always zero. This would
overwrite previous PCMs and cause the FW to return invalid PCM error
messages.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-16 17:18:20 +00:00
Liam Girdwood 07d025363a topology: remove deprecated drivers from test topologies
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-16 12:00:04 +00:00
Liam Girdwood d041c6f42d topology: byt-rt5640: rt5640 uses SSP2-Codec
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-16 11:59:24 +00:00
Liam Girdwood dcee7c1c53 topology: byt-rt5640: Fix DAI config
DAI config was coming from deprecated machine driver. Fix it to use
bytcr-rt5640 machine driver.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-15 21:28:11 +00:00