[Sound-open-firmware] [PATCH 3/6] topology: Add duplex support to test passthrough pipe
Liam Girdwood
liam.r.girdwood at linux.intel.com
Mon Dec 11 23:04:56 CET 2017
Signed-off-by: Liam Girdwood <liam.r.girdwood at linux.intel.com>
---
.../test-passthrough-16bit-48k-ssp2-nocodec.m4 | 43 +++++++++++++++++++---
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/topology/test-passthrough-16bit-48k-ssp2-nocodec.m4 b/topology/test-passthrough-16bit-48k-ssp2-nocodec.m4
index a1c0988..76bd75b 100644
--- a/topology/test-passthrough-16bit-48k-ssp2-nocodec.m4
+++ b/topology/test-passthrough-16bit-48k-ssp2-nocodec.m4
@@ -25,24 +25,57 @@ define(`TEST_DAI_LINK_NAME', `NoCodec')
#
# Define the pipeline
#
-# PCM0 ----> SSP2
+# PCM0 <---> SSP2
#
-# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le.
+# Passthrough playback pipeline 1 on PCM 0 using max 2 channels of s24le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
# Use DMAC 0 channel 1 for PCM audio playback data
-PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-playback.m4,
- 1, 0, 2, s16le,
+PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-playback.m4,
+ 1, 0, 2, s16le,
48, 1000, 0, 0, 0, 1,
SSP, 2, s16le, 2)
+
+# Passthrough playback pipeline 2 on PCM 0 using max 2 channels of s24le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+# Use DMAC 0 channel 1 for PCM audio playback data
+
+PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-capture.m4,
+ 2, 0, 2, s16le,
+ 48, 1000, 0, 0, 0, 1,
+ SSP, 2, s16le, 2)
+
+#
+# DAI configuration
+#
+# SSP port 2 is our only pipeline DAI
+#
+
+# playback DAI is SSP2 using 2 periods
+# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
+DAI_ADD(sof/pipe-dai-playback.m4,
+ 1, SSP, 2,
+ PIPELINE_SOURCE_1, 2, s16le,
+ 48, 1000, 0, 0)
+
+# capture DAI is SSP2 using 2 periods
+# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
+DAI_ADD(sof/pipe-dai-capture.m4,
+ 2, SSP, 2,
+ PIPELINE_SINK_2, 2, s16le,
+ 48, 1000, 0, 0)
+
+# PCM Passthrough
+PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
+
#
# BE configurations - overrides config in ACPI if present
#
# Clocks masters wrt codec
#
-# 24bit I2S using 25bit sample conatiner on SSP2
+# 16bit I2S using 20bit sample conatiner on SSP2
#
DAI_CONFIG(SSP, 2, TEST_DAI_LINK_NAME, I2S, 16,
DAI_CLOCK(mclk, 19200000, slave),
--
2.14.1
More information about the Sound-open-firmware
mailing list