OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
sof/tools/topology/sof-apl-dmic.m4

100 lines
2.9 KiB
Plaintext
Raw Normal View History

Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
#
# Topology for Apollo Lake with direct attach digital microphones array
#
# Include topology builder
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
# Include TLV library
include(`common/tlv.m4')
# Include Token library
include(`sof/tokens.m4')
# Include Apollolake DSP configuration
include(`platform/intel/bxt.m4')
include(`platform/intel/dmic.m4')
topology: merge sof-apl-dmic-2ch and sof-apl-dmic-4ch m4 files Use the same m4 files to generate both 2ch and 4ch topologies by defining channels during compilation. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2019-03-15 03:13:24 +08:00
define(DMIC_PDM_CONFIG, ifelse(CHANNELS, `4', ``FOUR_CH_PDM0_PDM1'',
TPLG: Fix mistake in 2ch configuration related DMIC macro This patch fixes 2ch dmic capture topology. It appeared as topology completion fail in SOF boot. The missing quote characters in m4 caused the STEREO_PDM0 macro triggered lines to no not be included into conf file. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-04-15 20:29:47 +08:00
`ifelse(CHANNELS, `2', ``STEREO_PDM0'', `')'))
topology: merge sof-apl-dmic-2ch and sof-apl-dmic-4ch m4 files Use the same m4 files to generate both 2ch and 4ch topologies by defining channels during compilation. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2019-03-15 03:13:24 +08:00
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
#
# Define the pipelines
#
DMIC: Enable capture from secondary FIFO This patch enables the FIFO B in addition to previously supported FIFO A. It allows in topology to use in pipelines the DMIC DAI type with indices 0 and 1. The DAI instances can be operated with different sample rate and different PCM format. The other topology parameters for microphones need to be the same (number of channels and enabled microphones). If the request via topology differs for those parameters the latter request overrides the first request. Typical usage for this added feature is to provide compact 16 kHz / 16 bit capture version for speech in addition to normal 48 kHz / 32 bit media quality audio capture. The DMIC HW actually provides a bit more freedom for FIR/FIFO A/B usage difference but all of that is not exposed yet via the driver due to added complexity. Some trace prints for DMIC parameters and used configuration are modified to print shorter lines for easier reading. The print order is adjusted to be more logical. The patch modifies two topologies to showcase the feature. The sof-apl-dmic-2ch/4ch topologies for APL nocodec machine driver are changed to instantiate in addition PCM7 set for 16 kHz 16 bit format in addition to earlier PCM6. Note: The required change to pipe-passthrough-capture.m4 PCM capability to enable other than 48 kHz rate is not done to not break important test cases. Another PR addresses the PCM capabilities and after it is merged allowing 16 kHz PCM for DMIC capture can be done safely. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-01-18 01:42:08 +08:00
# PCM6 <----- DMIC6 (DMIC01)
# PCM7 <----- DMIC7 (DMIC16k)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
#
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
dnl PIPELINE_PCM_ADD(pipeline,
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
dnl pipe id, pcm, max channels, format,
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
dnl period, priority, core,
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
dnl pcm_min_rate, pcm_max_rate, pipeline_rate,
dnl time_domain, sched_comp)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
topology: merge sof-apl-dmic-2ch and sof-apl-dmic-4ch m4 files Use the same m4 files to generate both 2ch and 4ch topologies by defining channels during compilation. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2019-03-15 03:13:24 +08:00
# Passthrough capture pipeline 6 on PCM 6 using max channels defined by CHANNELS.
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
# Set 1000us deadline on core 0 with priority 0
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
topology: merge sof-apl-dmic-2ch and sof-apl-dmic-4ch m4 files Use the same m4 files to generate both 2ch and 4ch topologies by defining channels during compilation. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2019-03-15 03:13:24 +08:00
6, 6, CHANNELS, s32le,
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
1000, 0, 0,
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
48000, 48000, 48000)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
topology: merge sof-apl-dmic-2ch and sof-apl-dmic-4ch m4 files Use the same m4 files to generate both 2ch and 4ch topologies by defining channels during compilation. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2019-03-15 03:13:24 +08:00
# Passthrough capture pipeline 7 on PCM 7 using max channels defined by CHANNELS.
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
# Set 1000us deadline on core 0 with priority 0
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
TPLG: Change volume capture pipeline gain range to -50 .. +30 dB This patch replaces the -64 to 0 dB volume scale for capture with more practical -50 to +30 dB gain. The step is 1 dB. It allows to compensate for different microphone model sensitivities when constant acoustical decibels to digital decibels level is needed in a microphone capture application. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-04-16 22:34:09 +08:00
7, 7, CHANNELS, s32le,
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
1000, 0, 0,
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
16000, 16000, 16000)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
#
# DAIs configuration
#
dnl DAI_ADD(pipeline,
dnl pipe id, dai type, dai_index, dai_be,
dnl buffer, periods, format,
topology: apl: glk: use 3 periods for SSP and DMIC DAIs Changes number of SSP and DMIC DAI periods from 2 to 3. This way we can support both timer and new single DMA channel scheduling. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-09-19 22:19:49 +08:00
dnl deadline, priority, core, time_domain)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
# capture DAI is DMIC 0 using 2 periods
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
# Buffers use s32le format, 1000us deadline on core 0 with priority 0
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
DAI_ADD(sof/pipe-dai-capture.m4,
DMIC: Enable capture from secondary FIFO This patch enables the FIFO B in addition to previously supported FIFO A. It allows in topology to use in pipelines the DMIC DAI type with indices 0 and 1. The DAI instances can be operated with different sample rate and different PCM format. The other topology parameters for microphones need to be the same (number of channels and enabled microphones). If the request via topology differs for those parameters the latter request overrides the first request. Typical usage for this added feature is to provide compact 16 kHz / 16 bit capture version for speech in addition to normal 48 kHz / 32 bit media quality audio capture. The DMIC HW actually provides a bit more freedom for FIR/FIFO A/B usage difference but all of that is not exposed yet via the driver due to added complexity. Some trace prints for DMIC parameters and used configuration are modified to print shorter lines for easier reading. The print order is adjusted to be more logical. The patch modifies two topologies to showcase the feature. The sof-apl-dmic-2ch/4ch topologies for APL nocodec machine driver are changed to instantiate in addition PCM7 set for 16 kHz 16 bit format in addition to earlier PCM6. Note: The required change to pipe-passthrough-capture.m4 PCM capability to enable other than 48 kHz rate is not done to not break important test cases. Another PR addresses the PCM capabilities and after it is merged allowing 16 kHz PCM for DMIC capture can be done safely. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-01-18 01:42:08 +08:00
6, DMIC, 0, NoCodec-6,
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
PIPELINE_SINK_6, 2, s32le,
topology: cavs: switch all pipelines to timer scheduling Switches all pipelines for cAVS platforms to timer scheduling. This way we limit the number of interrupt levels processed in the system. Timer, IPC and IDC are already on level 2 and DMAs are on level 5. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-15 19:40:26 +08:00
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
# capture DAI is DMIC 1 using 2 periods
topology: enable pcm range and pipeline rate and remove frame count Enable setting pcm min and max rate from top level m4 pipeline macro. This way it is possible to configure the whole pipeline to correct samplerate range in 1 file. Previously you needed to modify the pipeline macros where the rate was hardcoded. As the frame count is calculated from pcm/dai rate and scheduling time the frame count is obsolete. Introduce pipeline rate parameter to help configuring components with fixed output rate. We can't deduce this from pcm range since for example src might accept bigger max rate than the following dai. Even though the parameter is named "pipeline rate" it essentially means the "final" output rate to which this pipeline is connected to (dai or other pipeline). In capture pipelines it means the originating fixed dai rate. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-01-03 20:11:21 +08:00
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
DMIC: Enable capture from secondary FIFO This patch enables the FIFO B in addition to previously supported FIFO A. It allows in topology to use in pipelines the DMIC DAI type with indices 0 and 1. The DAI instances can be operated with different sample rate and different PCM format. The other topology parameters for microphones need to be the same (number of channels and enabled microphones). If the request via topology differs for those parameters the latter request overrides the first request. Typical usage for this added feature is to provide compact 16 kHz / 16 bit capture version for speech in addition to normal 48 kHz / 32 bit media quality audio capture. The DMIC HW actually provides a bit more freedom for FIR/FIFO A/B usage difference but all of that is not exposed yet via the driver due to added complexity. Some trace prints for DMIC parameters and used configuration are modified to print shorter lines for easier reading. The print order is adjusted to be more logical. The patch modifies two topologies to showcase the feature. The sof-apl-dmic-2ch/4ch topologies for APL nocodec machine driver are changed to instantiate in addition PCM7 set for 16 kHz 16 bit format in addition to earlier PCM6. Note: The required change to pipe-passthrough-capture.m4 PCM capability to enable other than 48 kHz rate is not done to not break important test cases. Another PR addresses the PCM capabilities and after it is merged allowing 16 kHz PCM for DMIC capture can be done safely. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-01-18 01:42:08 +08:00
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
topology: revert all cAVS pipelines to 2 periods Reverts all previosly changed cAVS pipelines from 3 to 2 periods. Now we have separate buffers for DMA, so there is no need to make DAI buffers consist of 3 periods. DMA will take care of any internal hardware requirements. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-22 15:09:58 +08:00
PIPELINE_SINK_7, 2, s16le,
topology: cavs: switch all pipelines to timer scheduling Switches all pipelines for cAVS platforms to timer scheduling. This way we limit the number of interrupt levels processed in the system. Timer, IPC and IDC are already on level 2 and DMAs are on level 5. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-10-15 19:40:26 +08:00
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
topology: merge sof-apl-dmic-2ch and sof-apl-dmic-4ch m4 files Use the same m4 files to generate both 2ch and 4ch topologies by defining channels during compilation. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2019-03-15 03:13:24 +08:00
DMIC: Enable capture from secondary FIFO This patch enables the FIFO B in addition to previously supported FIFO A. It allows in topology to use in pipelines the DMIC DAI type with indices 0 and 1. The DAI instances can be operated with different sample rate and different PCM format. The other topology parameters for microphones need to be the same (number of channels and enabled microphones). If the request via topology differs for those parameters the latter request overrides the first request. Typical usage for this added feature is to provide compact 16 kHz / 16 bit capture version for speech in addition to normal 48 kHz / 32 bit media quality audio capture. The DMIC HW actually provides a bit more freedom for FIR/FIFO A/B usage difference but all of that is not exposed yet via the driver due to added complexity. Some trace prints for DMIC parameters and used configuration are modified to print shorter lines for easier reading. The print order is adjusted to be more logical. The patch modifies two topologies to showcase the feature. The sof-apl-dmic-2ch/4ch topologies for APL nocodec machine driver are changed to instantiate in addition PCM7 set for 16 kHz 16 bit format in addition to earlier PCM6. Note: The required change to pipe-passthrough-capture.m4 PCM capability to enable other than 48 kHz rate is not done to not break important test cases. Another PR addresses the PCM capabilities and after it is merged allowing 16 kHz PCM for DMIC capture can be done safely. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-01-18 01:42:08 +08:00
dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
dnl PCM_CAPTURE_ADD(name, pipeline, capture)
DMIC: Enable capture from secondary FIFO This patch enables the FIFO B in addition to previously supported FIFO A. It allows in topology to use in pipelines the DMIC DAI type with indices 0 and 1. The DAI instances can be operated with different sample rate and different PCM format. The other topology parameters for microphones need to be the same (number of channels and enabled microphones). If the request via topology differs for those parameters the latter request overrides the first request. Typical usage for this added feature is to provide compact 16 kHz / 16 bit capture version for speech in addition to normal 48 kHz / 32 bit media quality audio capture. The DMIC HW actually provides a bit more freedom for FIR/FIFO A/B usage difference but all of that is not exposed yet via the driver due to added complexity. Some trace prints for DMIC parameters and used configuration are modified to print shorter lines for easier reading. The print order is adjusted to be more logical. The patch modifies two topologies to showcase the feature. The sof-apl-dmic-2ch/4ch topologies for APL nocodec machine driver are changed to instantiate in addition PCM7 set for 16 kHz 16 bit format in addition to earlier PCM6. Note: The required change to pipe-passthrough-capture.m4 PCM capability to enable other than 48 kHz rate is not done to not break important test cases. Another PR addresses the PCM capabilities and after it is merged allowing 16 kHz PCM for DMIC capture can be done safely. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-01-18 01:42:08 +08:00
PCM_CAPTURE_ADD(DMIC01, 6, PIPELINE_PCM_6)
PCM_CAPTURE_ADD(DMIC16k, 7, PIPELINE_PCM_7)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
#
# BE configurations - overrides config in ACPI if present
#
dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config)
DAI_CONFIG(DMIC, 0, 6, NoCodec-6,
dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max,
Topology: Add SOF_TKN_INTEL_DMIC_UNMUTE_RAMP_TIME_MS token This patch adds to all DMIC related topologies the new token SOF_TKN_INTEL_DMIC_UNMUTE_RAMP_TIME_MS. The value is set to 400 to correspond to 400 milliseconds long unmute ramp time. The topology defined unmute will override the firmware internal hard coded value if it is set in topology. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-06-03 22:35:13 +08:00
dnl sample_rate, fifo word length, unmute time, type,
dnl dai_index, pdm controller config)
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
Topology: Add SOF_TKN_INTEL_DMIC_UNMUTE_RAMP_TIME_MS token This patch adds to all DMIC related topologies the new token SOF_TKN_INTEL_DMIC_UNMUTE_RAMP_TIME_MS. The value is set to 400 to correspond to 400 milliseconds long unmute ramp time. The topology defined unmute will override the firmware internal hard coded value if it is set in topology. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-06-03 22:35:13 +08:00
DMIC_WORD_LENGTH(s32le), 400, DMIC, 0,
topology: merge sof-apl-dmic-2ch and sof-apl-dmic-4ch m4 files Use the same m4 files to generate both 2ch and 4ch topologies by defining channels during compilation. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2019-03-15 03:13:24 +08:00
PDM_CONFIG(DMIC, 0, DMIC_PDM_CONFIG)))
Topology: Add 2ch and 4ch raw DMIC capture topologies for APL This patch adds two minimal capture topologies to enable doing tests those require raw audio capture with unmodified S32_LE samples, e.g. channels order preserve test where the mic # origin can be checked from side information in LSB bits. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 16:27:25 +08:00
DMIC: Enable capture from secondary FIFO This patch enables the FIFO B in addition to previously supported FIFO A. It allows in topology to use in pipelines the DMIC DAI type with indices 0 and 1. The DAI instances can be operated with different sample rate and different PCM format. The other topology parameters for microphones need to be the same (number of channels and enabled microphones). If the request via topology differs for those parameters the latter request overrides the first request. Typical usage for this added feature is to provide compact 16 kHz / 16 bit capture version for speech in addition to normal 48 kHz / 32 bit media quality audio capture. The DMIC HW actually provides a bit more freedom for FIR/FIFO A/B usage difference but all of that is not exposed yet via the driver due to added complexity. Some trace prints for DMIC parameters and used configuration are modified to print shorter lines for easier reading. The print order is adjusted to be more logical. The patch modifies two topologies to showcase the feature. The sof-apl-dmic-2ch/4ch topologies for APL nocodec machine driver are changed to instantiate in addition PCM7 set for 16 kHz 16 bit format in addition to earlier PCM6. Note: The required change to pipe-passthrough-capture.m4 PCM capability to enable other than 48 kHz rate is not done to not break important test cases. Another PR addresses the PCM capabilities and after it is merged allowing 16 kHz PCM for DMIC capture can be done safely. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-01-18 01:42:08 +08:00
DAI_CONFIG(DMIC, 1, 7, NoCodec-7,
dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max,
Topology: Add SOF_TKN_INTEL_DMIC_UNMUTE_RAMP_TIME_MS token This patch adds to all DMIC related topologies the new token SOF_TKN_INTEL_DMIC_UNMUTE_RAMP_TIME_MS. The value is set to 400 to correspond to 400 milliseconds long unmute ramp time. The topology defined unmute will override the firmware internal hard coded value if it is set in topology. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-06-03 22:35:13 +08:00
dnl sample_rate, fifo word length, unmute time, type,
dnl dai_index, pdm controller config)
DMIC: Enable capture from secondary FIFO This patch enables the FIFO B in addition to previously supported FIFO A. It allows in topology to use in pipelines the DMIC DAI type with indices 0 and 1. The DAI instances can be operated with different sample rate and different PCM format. The other topology parameters for microphones need to be the same (number of channels and enabled microphones). If the request via topology differs for those parameters the latter request overrides the first request. Typical usage for this added feature is to provide compact 16 kHz / 16 bit capture version for speech in addition to normal 48 kHz / 32 bit media quality audio capture. The DMIC HW actually provides a bit more freedom for FIR/FIFO A/B usage difference but all of that is not exposed yet via the driver due to added complexity. Some trace prints for DMIC parameters and used configuration are modified to print shorter lines for easier reading. The print order is adjusted to be more logical. The patch modifies two topologies to showcase the feature. The sof-apl-dmic-2ch/4ch topologies for APL nocodec machine driver are changed to instantiate in addition PCM7 set for 16 kHz 16 bit format in addition to earlier PCM6. Note: The required change to pipe-passthrough-capture.m4 PCM capability to enable other than 48 kHz rate is not done to not break important test cases. Another PR addresses the PCM capabilities and after it is merged allowing 16 kHz PCM for DMIC capture can be done safely. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-01-18 01:42:08 +08:00
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000,
Topology: Add SOF_TKN_INTEL_DMIC_UNMUTE_RAMP_TIME_MS token This patch adds to all DMIC related topologies the new token SOF_TKN_INTEL_DMIC_UNMUTE_RAMP_TIME_MS. The value is set to 400 to correspond to 400 milliseconds long unmute ramp time. The topology defined unmute will override the firmware internal hard coded value if it is set in topology. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-06-03 22:35:13 +08:00
DMIC_WORD_LENGTH(s16le), 400, DMIC, 1,
topology: merge sof-apl-dmic-2ch and sof-apl-dmic-4ch m4 files Use the same m4 files to generate both 2ch and 4ch topologies by defining channels during compilation. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2019-03-15 03:13:24 +08:00
PDM_CONFIG(DMIC, 1, DMIC_PDM_CONFIG)))