[Sound-open-firmware] [PATCH] Revert "topology: reef-apl-nocodec: use SSP4 for playback and SSP2 for both"

[Liam Girdwood]

This reverts commit 0d63b75d1e74e2fcb9508fc1585db983c7fb3482.

Needs multi DAI support scheduled for 1.2

Signed-off-by: Liam Girdwood <liam.r.girdwood at linux.intel.com>
---
 topology/reef-apl-nocodec.m4 | 96 ++++++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 43 deletions(-)

diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4
index 72eff0e..78a1a4e 100644
--- a/topology/reef-apl-nocodec.m4
+++ b/topology/reef-apl-nocodec.m4
@@ -19,72 +19,82 @@ include(`dsps/bxt.m4')
 #
 # Define the pipelines
 #
-# PCM0 ----> Volume ----> SSP4
-# PCM1 ----> Volume ----> SSP2
-# PCM2 <---- Volume <---- SSP2
+# PCM0 ----> volume ---------------+
+#                                  |--low latency mixer ----> volume ---->  SSP2
+# PCM2 ----> SRC -----> volume ----+
+#                                  |
+#           Tone -----> volume ----+
+#
+# PCM1 <---- Volume <---- SSP2
 #
 
-# Volume playback pipeline 1 on PCM 0 using max 2 channels of s16le.
-# 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-volume-playback.m4,
-    1, 0, 2, s16le,
-    48, 1000, 0, 0, 0, 1, SSP, 4, s16le, 2)
-
-# Volume playback pipeline 1 on PCM 0 using max 2 channels of s16le.
+# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
 # 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-volume-playback.m4,
-    2, 1, 2, s16le,
-    48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
+	1, 0, 2, s32le,
+	48, 1000, 0, 0, 0, 1)
 
-# Volume playback pipeline 1 on PCM 0 using max 2 channels of s16le.
+# 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
 # Use DMAC 0 channel 2 for PCM audio capture data
-PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
-    3, 1, 2, s16le,
-    48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+	2, 0, 2, s32le,
+	48, 1000, 0, 0, 0, 2)
+
+# 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
+# Use DMAC 0 channel 3 for PCM audio playback data
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+	3, 1, 2, s32le,
+	96, 2000, 1, 0, 0, 3)
+
+# 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
 #
-
-# 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,
-	1, SSP, 4, SSP4-NoCodec,
-	PIPELINE_SOURCE_1, 2, s16le,
-	48, 1000, 0, 0)
+# 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
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
 DAI_ADD(sof/pipe-dai-playback.m4,
-	2, SSP, 2, SSP4-NoCodec,
-	PIPELINE_SOURCE_2, 2, s16le,
+	1, SSP, 2, NoCodec,
+	PIPELINE_SOURCE_1, 2, s24le,
 	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
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
 DAI_ADD(sof/pipe-dai-capture.m4,
-	3, SSP, 2, SSP2-NoCodec,
-	PIPELINE_SINK_3, 2, s16le,
+	2, SSP, 2, NoCodec,
+	PIPELINE_SINK_2, 2, s24le,
 	48, 1000, 0, 0)
 
 # PCM Low Latency
-PCM_PLAYBACK_ADD(Port4, 1, 0, 0, PIPELINE_PCM_1)
-PCM_DUPLEX_ADD(Port2, 4, 1, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)
+PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 
 #
 # BE configurations - overrides config in ACPI if present
 #
-DAI_CONFIG(SSP, 2, SSP2-NoCodec, I2S, 16,
-	DAI_CLOCK(mclk, 24576000, slave),
-	DAI_CLOCK(bclk, 1536000, slave),
-	DAI_CLOCK(fsync, 48000, slave),
-	DAI_TDM(2, 16, 3, 3))
-
-DAI_CONFIG(SSP, 4, SSP4-NoCodec, I2S, 16,
-	DAI_CLOCK(mclk, 24576000, slave),
-	DAI_CLOCK(bclk, 1536000, slave),
+DAI_CONFIG(SSP, 2, NoCodec, I2S, 24,
+	DAI_CLOCK(mclk, 19200000, slave),
+	DAI_CLOCK(bclk, 2400000, slave),
 	DAI_CLOCK(fsync, 48000, slave),
-	DAI_TDM(2, 16, 3, 3))
+	DAI_TDM(2, 25, 3, 3))
-- 
2.14.1