Commit Graph

156 Commits

Author SHA1 Message Date
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 56e26dd528 Merge branch '1.1-stable' 2018-04-05 15:21:08 +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 638127bf41 Merge tag 'v1.1'
v1.1
2018-04-04 15:03:38 +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
Tomasz Lauda 78ad1ccce5 rmbox: Close opened files
Input and output files in trace_read function should be closed after using.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2018-03-29 13:46:36 +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
Liam Girdwood 6e82dfb5d1 topology: byt-da7213: fix topology file name.
reef-byt-da7212 -> reef-byt->da7213

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-15 17:01:38 +00:00
Liam Girdwood 9b220db879 topology: byt-rt5640. Fix DAI stream name.
Stream name should match bytcr driver and not legacy byt-rt5640 driver.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-15 11:40:09 +00:00
Liam Girdwood 8d9b8d51f9 topology: Add stream name to DAI widgets for binding to DAI links
DAI Widgets need bound to a DAI link to complete the DAPM graph. This is
only working atm as we are only using one DAI. Add stream name to DAI
widgets to be used by topology binder.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-13 20:35:42 +00:00
Pan Xiuli 5b5bbe31e6 topology: Remove volume mute in volume pipeline
Volume mute will cause a regression. Delete it now.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-03-07 11:01:34 +00:00
Pierre-Louis Bossart be6ff21ae9 topology: test: add simple test for Up2 board
Up^2 board exposes I2S signals on the 40-pin connector
(https://wiki.up-community.org/Pinout_UP2)

Add test for SSP5 (marked in pinout as AVS_I2S6)

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2018-03-07 09:32:03 +00:00
Ranjani Sridharan 3105de2481 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>
2018-03-06 21:46:03 +00:00
Liam Girdwood 59bcff216a topology: byt-rt5651: Fix BE DAI link name.
Should be SSP2-Codec.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-06 15:37:07 +00:00
Liam Girdwood 46a5e80fc5 rmbox: remove legacy code and use sof debugFS by default.
Dump error log by default with no args.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-06 14:11:13 +00:00
Ranjani Sridharan c95433636f topology: break up topology builder m4 files into per component macros
This patch break up the local.m4 and build.m4 topology builder includes
into per component m4 files

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-06 11:25:26 +00:00
Ranjani Sridharan a99283da77 topology: create m4 wrapper for Data section in pipeline definition
This patch adds a m4 wrapper for data section in pipeline definitions

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-06 11:13:19 +00:00
Ranjani Sridharan c529b32eae topology: create m4 wrapper for VendorTuples section in pipeline definition
This patch adds a m4 wrpper for Vendor Tuples sections
in pipeline definition

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-06 11:13:19 +00:00
Ranjani Sridharan 9d846ac85a topology: create m4 wrapper SectionPCMCapabilities
This patch adds a m4 wrpper for PCM Capabilities sections
in pipeline definition

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-06 11:13:19 +00:00
Ranjani Sridharan 625f2e1cc0 topology: create m4 wrapper for Graph section
This patch adds a m4 wrpper for Graph sections in pipeline definition

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-06 11:13:19 +00:00
Ranjani Sridharan ee8afc8064 topology: create m4 wrapper for mixer control section
This patch adds m4 wrapper for mixercontrol section in
pipeline definition

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-06 11:13:19 +00:00
Ranjani Sridharan b99d1de979 topology: add a test hostless tone pipeline
This patch adds changes to create a test hostless tone pipeline.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-06 11:13:19 +00:00
Ranjani Sridharan 29dd4df5d1 topology: add kcontrol for tone component
This patch adds the changes to add kcontrols to the tone component

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-06 11:13:19 +00:00
Ranjani Sridharan da6d3eabb7 topology: make list loop more generic with formatting argument
This patch adds changes to make list loop more generic with format argument

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-06 11:13:19 +00:00
Liam Girdwood 5b8dfd1301 topology: stringify buffer caps.
Needs to be string for proper alsa-conf parsing.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-05 16:05:39 +00:00
Liam Girdwood 21a4c7d71e topology: Add cannonlake platform differentiation header
Add differentiation M4 header macros for the Intel Cannonlake platform.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-05 13:41:41 +00:00
Liam Girdwood e02f6910d1 topology: Add support for memory capabilities
Add support in topology to define different memory capabilities that can
be included by standard pipeline definitions to set platform specific
capabilities for buffers.

This patch allows memory capabilities to be defined for each platform and
included by all pipeline definitions.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-03-05 13:38:12 +00:00
Ranjani Sridharan b4293de4cc rmbox: show error/xrun logs in red for easy identification
This patch adds changes to rmbox to make it easier to spot
errors/xruns in a long trace

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-03-01 19:38:22 +00:00