Commit Graph

303 Commits

Author SHA1 Message Date
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 57be4f5b8c rimage: fix manifest header path
We moved header manifest.h is sof/upai now. Modify the configure path
and include path.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-02-06 16:33:09 +00:00
Pan Xiuli b5cea7f966 rimage: add check for .bss section
We may have heap buffers for base FW, but they are handled by the
runtime function. We did not need to set them as bss in FW manifest.
So add check to mark the .bss segment as BSS and other segment as HEAP.
Then we only update manifest BSS segmet with BSS section.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-02-06 15:19:50 +00:00
Luo Xionghu 8c9ebfe9c4 2/3] rimage: add return for non-void function.
Signed-off-by: Luo Xionghu <xionghu.luo@intel.com>
2018-01-27 17:01: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
Liam Girdwood 59d81995f6 rimage: Add support for multiple modules with code signing
Add support so that rimage can take as it's input multiple ELF modules
and merge them into a single signed manifest and firmware binary.

Remove all hard coded module descriptions. Module metadata is now read
from the ELF "module" section.

Remove duplicated and unused code for creating simple firmware images as
used on Baytrail and Haswell.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2018-01-23 21:30:35 +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 bd40145123 rimage: Fix some memory leak error
Handle pointers and memory when error happens.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-20 15:27:56 +00:00
Pan Xiuli 6b59f8f698 rimage: Fix some memory leak error
Handle pointers and memory when error happens.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-20 14:16:15 +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
Liam Girdwood 8d47a54f5c rimage: remove flat file builder.
No longer needed so can be safely removed.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-20 09:07:44 +00:00
Liam Girdwood bd363e1631 rimage: update to new SOF driver file format.
Support the SOF driver file format.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-20 09:07:40 +00:00
Liam Girdwood 106192c58c rimage: remove flat file builder.
No longer needed so can be safely removed.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-20 09:04:24 +00:00
Liam Girdwood 2307a6ace2 rimage: update to new SOF driver file format.
Support the SOF driver file format.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-20 09:04:13 +00:00
Liam Girdwood 76d5b55b8a Merge branch '1.0-dev' 2017-12-19 14:51: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
Pierre-Louis Bossart 627e52bd67 soft: topology: add 16 and 24 bit passthrough for nocodec
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Pierre-Louis Bossart cd988c514d topology: add files for SSP2-Codec machine drivers
At some point we should have a better way of relying on common parts but
for now add a passthrough shortcut directly usable with machine drivers

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Pierre-Louis Bossart d72c06143e topology: add support for Dialog, Realtek and Maxim codecs
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Pierre-Louis Bossart 31c4918ad5 topology: remove stream_name for all DAI definitions
stream_name is not used by any machine drivers, there is no point in
providing the information to topology layers

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Pierre-Louis Bossart df8b473929 topology: remove stream_name parameter from DAI_CONFIG
This value is never set in machine drivers, no point in setting it
here

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Liam Girdwood f3b486537d topology: add test pass through pipe for 16bit 48kHz on SSP2
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-05 16:31:49 +00:00
Liam Girdwood 44bced3781 rmbox: use 64bit trace data
Update trace to align with FW and use 64bit data size.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-10-19 22:24:58 +01:00
Liam Girdwood cd0eb84aca rmbox: move trace into separate parser function to ease future work.
Move trace handler into separate function to make it easier to add new
trace features. Make sure we only support 64 bit timestamps.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-10-13 16:41:29 +01:00
Yan Wang 082b84ac61 Use new output format for 64-bit timestamp.
1. Use [second.microsecond] for 64-bit timestamp.
2. Keep previous format for 32-bit timestamp.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2017-10-13 11:13:39 +01:00
Yan Wang 7f98c95c2a Add option "-t" to process DMA trace event with 64-bit tempstamp.
1. Timestamp is changed to 64-bit width.
2. Trace event is still 32-bit. High 32-bit of 64-bit is ignored.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2017-10-12 22:40:57 +01:00