topology: sof-apl-nocodec: enable multiple SSP pipelines
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4
index 07a1c5b..3ba5806 100644
--- a/topology/sof-apl-nocodec.m4
+++ b/topology/sof-apl-nocodec.m4
@@ -3,10 +3,10 @@
#
# Include topology builder
-include(`pipeline.m4')
include(`utils.m4')
include(`dai.m4')
include(`ssp.m4')
+include(`pipeline.m4')
# Include TLV library
include(`common/tlv.m4')
@@ -20,80 +20,232 @@
#
# Define the pipelines
#
-# PCM0 ----> volume ---------------+
-# |--low latency mixer ----> volume ----> SSP2
-# PCM2 ----> SRC -----> volume ----+
-# |
-# Tone -----> volume ----+
-#
-# PCM1 <---- Volume <---- SSP2
+# PCM0 ----> volume -----> SSP0
+# <---- volume <----- SSP0
+# PCM1 <---- Volume <----- SSP1
+# <---- Volume <----- SSP1
+# PCM2 ----> volume -----> SSP2
+# <---- Volume <----- SSP2
+# PCM3 ----> volume -----> SSP3
+# <---- volume <----- SSP3
+# PCM4 ----> volume -----> SSP4
+# <---- Volume <----- SSP4
+# PCM5 ----> volume -----> SSP5
+# <---- volume <----- SSP3
#
-# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
+# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
-PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
- 1, 0, 2, s32le,
+PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
+ 1, 0, 2, s16le,
+ 48, 1000, 0, 0, SSP, 0, s16le, 2)
+
+# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
+ 2, 0, 2, s16le,
+ 48, 1000, 0, 0, SSP, 0, s16le, 2)
+
+# Low Latency playback pipeline 3 on PCM 1 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
+ 3, 1, 2, s16le,
+ 48, 1000, 0, 0, SSP, 1, s16le, 2)
+
+# Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
+ 4, 1, 2, s16le,
+ 48, 1000, 0, 0, SSP, 1, s16le, 2)
+
+# Low Latency playback pipeline 5 on PCM 2 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
+ 5, 2, 2, s16le,
+ 48, 1000, 0, 0, SSP, 2, s16le, 2)
+
+# Low Latency capture pipeline 6 on PCM 2 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
+ 6, 2, 2, s16le,
+ 48, 1000, 0, 0, SSP, 2, s16le, 2)
+
+# Low Latency playback pipeline 7 on PCM 3 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
+ 7, 3, 2, s16le,
+ 48, 1000, 0, 0, SSP, 3, s16le, 2)
+
+# Low Latency capture pipeline 8 on PCM 3 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
+ 8, 3, 2, s16le,
+ 48, 1000, 0, 0, SSP, 3, s16le, 2)
+
+# Low Latency playback pipeline 9 on PCM 4 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+#PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
+# 9, 4, 2, s16le,
+# 48, 1000, 0, 0, SSP, 4, s16le, 2)
+
+# Low Latency capture pipeline 10 on PCM 4 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+#PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
+# 10, 4, 2, s16le,
+# 48, 1000, 0, 0, SSP, 4, s16le, 2)
+
+# Low Latency playback pipeline 11 on PCM 5 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+#PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
+# 11, 5, 2, s16le,
+# 48, 1000, 0, 0, SSP, 5, s16le, 2)
+
+# Low Latency capture pipeline 12 on PCM 5 using max 2 channels of s16le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+#PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
+# 12, 5, 2, s16le,
+# 48, 1000, 0, 0, SSP, 5, s16le, 2)
+
+
+#
+# DAIs configuration
+#
+
+# playback DAI is SSP0 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, 0, NoCodec-0,
+ PIPELINE_SOURCE_1, 2, s16le,
48, 1000, 0, 0)
-# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
-# Schedule 48 frames per 1000us deadline on core 0 with priority 0
-PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
- 2, 0, 2, s32le,
+# capture DAI is SSP0 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, 0, NoCodec-0,
+ PIPELINE_SINK_2, 2, s16le,
48, 1000, 0, 0)
-# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
-# Schedule 96 frames per 2000us deadline on core 0 with priority 1
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
- 3, 1, 2, s32le,
- 96, 2000, 1, 0)
+# playback DAI is SSP1 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,
+ 3, SSP, 1, NoCodec-1,
+ PIPELINE_SOURCE_3, 2, s16le,
+ 48, 1000, 0, 0)
-# Tone Playback pipeline 5 using max 2 channels of s32le.
-# Schedule 192 frames per 4000us deadline on core 0 with priority 2
-PIPELINE_ADD(sof/pipe-tone.m4,
- 5, 2, s32le,
- 192, 4000, 2, 0)
-
-# Connect pipelines together
-SectionGraph."pipe-apl-nocodec" {
- index "0"
-
- lines [
- # media 0
- dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3)
- #tone
- dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5)
- ]
-}
-
-#
-# DAI configuration
-#
-# SSP port 2 is our only pipeline DAI
-#
+# capture DAI is SSP1 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,
+ 4, SSP, 1, NoCodec-1,
+ PIPELINE_SINK_4, 2, s16le,
+ 48, 1000, 0, 0)
# playback DAI is SSP2 using 2 periods
-# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
+# 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, NoCodec,
- PIPELINE_SOURCE_1, 2, s24le,
+ 5, SSP, 2, NoCodec-2,
+ PIPELINE_SOURCE_5, 2, s16le,
48, 1000, 0, 0)
# capture DAI is SSP2 using 2 periods
-# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
+# 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, NoCodec,
- PIPELINE_SINK_2, 2, s24le,
+ 6, SSP, 2, NoCodec-2,
+ PIPELINE_SINK_6, 2, s16le,
48, 1000, 0, 0)
-# PCM Low Latency
-PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
+# playback DAI is SSP3 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,
+ 7, SSP, 3, NoCodec-3,
+ PIPELINE_SOURCE_7, 2, s16le,
+ 48, 1000, 0, 0)
+
+# capture DAI is SSP3 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,
+ 8, SSP, 3, NoCodec-3,
+ PIPELINE_SINK_8, 2, s16le,
+ 48, 1000, 0, 0)
+
+# playback DAI is SSP4 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,
+# 9, SSP, 4, NoCodec,
+# PIPELINE_SOURCE_9, 2, s16le,
+# 48, 1000, 0, 0)
+
+# capture DAI is SSP4 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,
+# 10, SSP, 4, NoCodec,
+# PIPELINE_SINK_10, 2, s16le,
+# 48, 1000, 0, 0)
+
+# playback DAI is SSP5 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,
+# 11, SSP, 5, NoCodec,
+# PIPELINE_SOURCE_11, 2, s16le,
+# 48, 1000, 0, 0)
+
+# capture DAI is SSP5 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,
+# 12, SSP, 5, NoCdec,
+# PIPELINE_SINK_12, 2, s16le,
+# 48, 1000, 0, 0)
+
+# PCM Low Latency, id 0
+PCM_DUPLEX_ADD(Port0, 0, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
+PCM_DUPLEX_ADD(Port1, 1, 1, 1, PIPELINE_PCM_3, PIPELINE_PCM_4)
+PCM_DUPLEX_ADD(Port2, 2, 2, 2, PIPELINE_PCM_5, PIPELINE_PCM_6)
+PCM_DUPLEX_ADD(Port3, 3, 3, 3, PIPELINE_PCM_7, PIPELINE_PCM_8)
+#PCM_DUPLEX_ADD(Port4, 4, 4, 4, PIPELINE_PCM_9, PIPELINE_PCM_10)
+#PCM_DUPLEX_ADD(Port5, 5, 5, 5, PIPELINE_PCM_11, PIPELINE_PCM_12)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 2, 0, NoCodec,
- SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
- SSP_CLOCK(bclk, 2400000, codec_slave),
+
+DAI_CONFIG(SSP, 0, 0, NoCodec-0,
+ SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+ SSP_CLOCK(bclk, 1536000, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
- SSP_TDM(2, 25, 3, 3),
- SSP_CONFIG_DATA(SSP, 2, 24)))
+ SSP_TDM(2, 16, 3, 3),
+ SSP_CONFIG_DATA(SSP, 0, 16)))
+
+DAI_CONFIG(SSP, 1, 1, NoCodec-1,
+ SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+ SSP_CLOCK(bclk, 1536000, codec_slave),
+ SSP_CLOCK(fsync, 48000, codec_slave),
+ SSP_TDM(2, 16, 3, 3),
+ SSP_CONFIG_DATA(SSP, 1, 16)))
+
+DAI_CONFIG(SSP, 2, 2, NoCodec-2,
+ SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+ SSP_CLOCK(bclk, 1536000, codec_slave),
+ SSP_CLOCK(fsync, 48000, codec_slave),
+ SSP_TDM(2, 16, 3, 3),
+ SSP_CONFIG_DATA(SSP, 2, 16)))
+
+DAI_CONFIG(SSP, 3, 3, NoCodec-3,
+ SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+ SSP_CLOCK(bclk, 1536000, codec_slave),
+ SSP_CLOCK(fsync, 48000, codec_slave),
+ SSP_TDM(2, 16, 3, 3),
+ SSP_CONFIG_DATA(SSP, 3, 16)))
+
+#DAI_CONFIG(SSP, 4, 0, NoCodec,
+# SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+# SSP_CLOCK(bclk, 1536000, codec_slave),
+# SSP_CLOCK(fsync, 48000, codec_slave),
+# SSP_TDM(2, 16, 3, 3),
+# SSP_CONFIG_DATA(SSP, 4, 16)))
+
+#DAI_CONFIG(SSP, 5, 0, NoCodec,
+# SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+# SSP_CLOCK(bclk, 1536000, codec_slave),
+# SSP_CLOCK(fsync, 48000, codec_slave),
+# SSP_TDM(2, 16, 3, 3),
+# SSP_CONFIG_DATA(SSP, 5, 16)))
+
