Commit Graph

92 Commits

Author SHA1 Message Date
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
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
Yan Wang 49555a1707 Enable CNL topology generating.
Currently CNL topology definition is added but not enabled.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2018-02-23 08:28:04 +00:00
Pan Xiuli f6924b1701 topology: m4: add default_hw_conf_id
Add default_hw_conf_id to set the default_hw_config_id value in
ASOC and then we can set the dai config.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-02-13 09:23:07 +00:00
Ranjani Sridharan 09325e91fc topology: Allow multiple kcontrols for volume widget
This patch adds support for multiple kcontrols for the volume
widget and adds a mute switch kcontrol to the volume playback
pipeline.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-02-12 15:47:31 +00:00
Ranjani Sridharan f0b21aee38 topology: fix typos in capture pipelines
This patch fixes typos in the capture pipelines to avoid confusion.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-02-12 15:45:39 +00:00
Rander Wang 4d408b0cec topology: add toplogy for CNL with RT274 codec
Support playback and capture with volume control
at 48KHZ, 24Bit, TDM4 but only 2 channel valid

Signed-off-by: Rander Wang <rander.wang@intel.com>
2018-02-09 08:03:38 +00:00
Keyon Jie 33e4b0cc6f topology: test: change to use volume topology files for apl at the moment.
As it doesn't work for pass through at the moment.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-02-08 20:05:04 +00:00
Pan Xiuli b8ba5f65f2 topology: test: fix buffer size for volume
We may have different buffer size around volume.
Change the size due to the endpoint setting.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-01-27 16:54:51 +00:00
Pierre-Louis Bossart 9f94b57e67 topology: test: fix shell macro expansion for MCLK argument
shell expands $10 as $1 followed by 0, so test .conf topology files contained
mclk_freq "codec0" instead of the expected value (e.g. 19200000).

Parenthesis are required when there are more than 9 arguments to a
macro...

Reported-by: "Wang, Yan" <yan.wang@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2018-01-16 17:52:33 +00:00
Liam Girdwood a6bb8de907 topology: test: fix MCLK macro usage
Incorrect BCLK macro name used to specify MCLK. Fix.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-01-11 11:23:24 +00:00
Liam Girdwood 783198d190 Merge branch '1.0-stable'
# Conflicts:
#	topology/test/tplg-build.sh
2018-01-11 11:20:28 +00:00
Liam Girdwood 1f23137df9 rimage: build: Fix make dist and version.
make dist will now include the topology files.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-01-11 11:08:34 +00:00
Keyon Jie 1111cc11ca topology: test: make mclk configurable
The mclk may be different for different platforms, here make it
configurable for test topology files.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-01-10 20:37:55 +00:00
Pan Xiuli 0866b2a13e topology: test: Add test cases for SRC pipe
Add src pipe for test case.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-20 10:10:59 +00:00
Pan Xiuli 49d1ca9a13 topology: sof: Fix a typo for pipe src capture
Should be src capture here in capture pipe.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-20 10:10:59 +00:00
Pan Xiuli c737dcacc3 topology: test: Add test cases for SRC pipe
Add src pipe for test case.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-20 10:10:05 +00:00
Pan Xiuli 5dcdb6524d topology: sof: Fix a typo for pipe src capture
Should be src capture here in capture pipe.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-20 10:10:05 +00:00
Pan Xiuli a0b9292508 topology: test: Add capture and playback only test.
We may need these test for validation, add these tests.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-19 11:11:04 +00:00
Pan Xiuli c3bd862032 topology: m4: Add two macros for one direction PCM
We may need to generate capture only or playback only PCMs.
Add these macros to help generate them.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-19 11:11:04 +00:00
Pan Xiuli 90856416b6 topology: test: Refine name for test generator.
We have 5 critical arguments in the test generator but only used 3 for
the naming, this will make some files be overwritten.
Refine the name method to let these 5 arguments show in the tplg name.
Also we decide the pipe type in one of the argument, test-ssp.m4 and
test-src-ssp.m4 are almost the same, just remove one.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-19 11:11:04 +00:00
Liam Girdwood c20762ecac topology: test: Add simple component test generator.
Move testing pipelines into a test directory and reuse test scaffolding
so that they can be used to test multiple components on multiple target
with multiples configs.

Test topology scafolding are now pre-processed using a script to generate
the ALSA conf format with the various changes for each test case.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-13 21:08:57 +00:00
Liam Girdwood 8b254b5f3d topology: AIF directions are codec centric wrt PCMs
Commit 0a1a9bbc492e4eb22173ed57c7f5499c8f106289 discovered a bug in
the direction of AIF widgets in relation to PCMs. AIF widgets are codec
centric in ASoC so topology must align.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-13 21:06:27 +00:00
Keyon Jie 88519eee73 topology: fix 2 typos for capture pipeline
1. Widget N_PCMC type should be "aif_in", not "aif_out".
2. Widget W_DAI_IN data should be "N_DAI_IN", not "N_DAI_OUT".

Signed-off-by: Xiuli Pan <xiuli.pan@intel.com>
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2017-12-13 21:06:27 +00:00
Liam Girdwood 19e3240ec7 topology: Add duplex support to 24 bit volume passthrough
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:04:19 +00:00
Liam Girdwood e76aeeb7e9 topology: modify passthrough volume playback for duplex operation
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:03:50 +00:00
Liam Girdwood e094d38e95 topology: Add passthrough volume capture pipe
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:03:24 +00:00
Liam Girdwood 796989d774 topology: Add duplex support to test passthrough pipe
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:02:42 +00:00
Liam Girdwood 83b1704555 topology: Modify passthrough playback pipe for duplex operation
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:00:51 +00:00
Liam Girdwood 475fbdc01e topology: Add passthrough capture pipe
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:00:18 +00:00
Liam Girdwood 6dbbac5d13 topology: remove unused secondary media pcm
Secondary PCM not used atm for 1.0 release so temporarily remove from standard
topologies.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-07 21:18:15 +00:00
Pierre-Louis Bossart bfe32ee87c soft: topology: fix cht.m4
Not sure why we need these files, but the cht definitions are not
aligned with the others. Fix.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00