OrgACRN
/
soft
mirror of https://github.com/thesofproject/soft.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
soft/test/topology/test-capture.m4

90 lines
2.5 KiB
Plaintext
Raw Normal View History

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-18 11:52:13 +08:00
#
# Topology for pass through pipeline
#
# Include topology builder
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 06:17:12 +08:00
include(`dai.m4')
topology: move ssp related macros to ssp.m4 in platform/common Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-25 15:04:27 +08:00
include(`ssp.m4')
topology: move dmic related macros to dmic.m4 in platform/intel Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-25 15:09:53 +08:00
include(`dmic.m4')
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 06:17:12 +08:00
include(`utils.m4')
include(`pipeline.m4')
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-18 11:52:13 +08:00
# Include TLV library
include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')
# Include Baytrail DSP configuration
topology: move platform m4 files from dsps directory to platform/intel Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-25 14:42:07 +08:00
include(`byt.m4')
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-18 11:52:13 +08:00
#
# Machine Specific Config - !! MUST BE SET TO MATCH TEST MACHINE DRIVER !!
#
# TEST_PIPE_NAME - Pipe name
# TEST_DAI_LINK_NAME - BE DAI link name e.g. "NoCodec"
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-06-01 01:34:42 +08:00
# TEST_DAI_PORT - SSP port number e.g. 2
# TEST_DAI_FORMAT - SSP data format e.g s16le
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-18 11:52:13 +08:00
# TEST_PIPE_FORMAT - Pipeline format e.g. s16le
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>
2017-12-25 20:42:16 +08:00
# TEST_SSP_MCLK - SSP MCLK in Hz
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-18 11:52:13 +08:00
# TEST_SSP_BCLK - SSP BCLK in Hz
# TEST_SSP_PHY_BITS - SSP physical slot size
# TEST_SSP_DATA_BITS - SSP data slot size
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 14:57:37 +08:00
# TEST_SSP_MODE - SSP mode e.g. I2S, LEFT_J, DSP_A and DSP_B
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-18 11:52:13 +08:00
#
#
# Define the pipeline
#
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-06-01 01:34:42 +08:00
# PCM0 <---> SSP TEST_DAI_PORT
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-18 11:52:13 +08:00
#
SOFT: Increase test capture pipeline max. channels count to 4 The 4ch DMIC capture test topologies can't work without this change to pipeline. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-28 19:39:36 +08:00
# Passthrough capture pipeline 2 on PCM 0 using max 4 channels.
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-18 11:52:13 +08:00
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4,
SOFT: Increase test capture pipeline max. channels count to 4 The 4ch DMIC capture test topologies can't work without this change to pipeline. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-28 19:39:36 +08:00
2, 0, 4, TEST_PIPE_FORMAT,
topology: remove DMAC ID/DMAC_CHANNEL from PIPELINE/PCM/DAI definitions The firmware no longer uses the DMAC ID and channel info from topology. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-13 04:01:56 +08:00
48, 1000, 0, 0,
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-06-01 01:34:42 +08:00
TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
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-18 11:52:13 +08:00
#
# DAI configuration
#
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-06-01 01:34:42 +08:00
# SSP port TEST_DAI_PORT is our only pipeline DAI
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-18 11:52:13 +08:00
#
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-06-01 01:34:42 +08:00
# capture DAI is SSP TEST_DAI_PORT using 2 periods
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-18 11:52:13 +08:00
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
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-06-01 01:34:42 +08:00
2, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
PIPELINE_SINK_2, 2, TEST_DAI_FORMAT,
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-18 11:52:13 +08:00
48, 1000, 0, 0)
# PCM Passthrough
topology: changes to SectionPCM macros This patch addresses the following: 1. Move PCM_PLAYBACK_ADD to pcm.m4 The macro was in the wrong m4 file (buffer.m4) 2. Remove pipeline_id argument and "index" from SectionPCM "index" is not a member of struct snd_soc_tplg_pcm. So this information is not used in the kernel at all. Secondly, the PCM ID could be associated with more than one pipeline especially in the case of DUPLEX PCM's. So better to remove it to avoid ambiguities. 3. Remove dai_id This dai_id is the ID given to the CPU DAI when the FE DAI link is created. In the case of SOF, we should use an linearly increasing unique ID for CPU DAI ID's. If this argument is omitted, the kernel automatially assignes an ID based on the component->num_dai which is linearly incremented every time a new DAI link is added. 4. Finally update users to align with the new definitions. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-07-24 13:47:48 +08:00
PCM_CAPTURE_ADD(Passthrough, 0, PIPELINE_PCM_2)
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-18 11:52:13 +08:00
#
# BE configurations - overrides config in ACPI if present
#
# Clocks masters wrt codec
#
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-06-01 01:34:42 +08:00
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
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-18 11:52:13 +08:00
#
topology: change BE name for NoCodec to support multiple SSPs/BEs Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-06-25 17:32:43 +08:00
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
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-06-01 01:34:48 +08:00
ifelse(TEST_DAI_TYPE, `SSP',
SSP_CONFIG(TEST_SSP_MODE,
topology: move ssp related macros to ssp.m4 in platform/common Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-25 15:04:27 +08:00
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
topology: dai: rename sample_bits macro to config_data Rename SAMPLE_BITS macro to a more generic CONFIG_DATA macro for SSP to also include the mclk id. Also modify users of the macro with the new name. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-25 13:03:16 +08:00
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
topology: add test topologies with mclk id 1 Add some test topologies with mclk id 1 Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-27 01:30:12 +08:00
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)),
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-06-01 01:34:48 +08:00
TEST_DAI_TYPE, `DMIC',
topology: add more dmic test topologies This patch modifies the test topology generator to add dmic topologies with pre-defined PDM controller configurations, sample rates and formats. It also modifies the DMIC_CONFIG macro to get the number of active pdm from the pdm config. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-26 13:17:03 +08:00
DMIC_CONFIG(TEST_DMIC_DRIVER_VERSION, TEST_DMIC_CLK_MIN,
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-06-01 01:34:48 +08:00
TEST_DMIC_CLK_MAX, TEST_DMIC_DUTY_MIN,
topology: add more dmic test topologies This patch modifies the test topology generator to add dmic topologies with pre-defined PDM controller configurations, sample rates and formats. It also modifies the DMIC_CONFIG macro to get the number of active pdm from the pdm config. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-26 13:17:03 +08:00
TEST_DMIC_DUTY_MAX, TEST_DMIC_SAMPLE_RATE,
DMIC_WORD_LENGTH(TEST_DAI_FORMAT),
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-06-01 01:34:48 +08:00
TEST_DAI_TYPE, TEST_DAI_PORT,
PDM_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT,
topology: add more dmic test topologies This patch modifies the test topology generator to add dmic topologies with pre-defined PDM controller configurations, sample rates and formats. It also modifies the DMIC_CONFIG macro to get the number of active pdm from the pdm config. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-26 13:17:03 +08:00
TEST_DMIC_PDM_CONFIG)),
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-06-01 01:34:48 +08:00
`'))