[RFC] topology: add mux topology for apl and cml

tools/topology/CMakeLists.txt

@@ -37,6 +37,7 @@ set(TPLGS
 	"sof-apl-tdf8532\;sof-apl-tdf8532"
 	"sof-apl-pcm512x\;sof-apl-pcm512x"
 	"sof-apl-pcm512x-nohdmi\;sof-apl-pcm512x-nohdmi"
+	"sof-apl-demux-pcm512x\;sof-apl-demux-pcm512x"
 	"sof-apl-rt298\;sof-apl-rt298"
 	"sof-apl-wm8804\;sof-apl-wm8804"
 	"sof-apl-da7219\;sof-apl-da7219"
@@ -54,6 +55,7 @@ set(TPLGS
 	"sof-cml-rt5682\;sof-whl-rt5682\;-DPLATFORM=whl"
 	"sof-cml-rt5682\;sof-icl-rt5682\;-DPLATFORM=icl"
 	"sof-cml-src-rt5682\;sof-cml-src-rt5682"
+	"sof-cml-demux-rt5682\;sof-cml-demux-rt5682"
 	"sof-cnl-nocodec\;sof-cnl-nocodec"
 	"sof-cml-rt5682-max98357a\;sof-cml-rt5682-max98357a\;-DPLATFORM=cml"
 )

tools/topology/m4/demux_coef_default.m4

@@ -0,0 +1,11 @@
+CONTROLBYTES_PRIV(DEMUX_priv,
+`       bytes "0x53,0x4f,0x46,0x00,0x00,0x00,0x00,0x00,'
+`       0x28,0x00,0x00,0x00,0x00,0x60,0x00,0x03,'
+`       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,'
+`       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,'
+`       0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,'
+`       0x01,0x00,0x00,0x00,0x02,0x01,0x02,0x04,'
+`       0x08,0x10,0x20,0x40,0x80,0x00,0x00,0x00,'
+`       0x05,0x00,0x00,0x00,0x02,0x01,0x02,0x04,'
+`       0x08,0x10,0x20,0x40,0x80,0x00,0x00,0x00"'
+)

tools/topology/m4/muxdemux.m4

@@ -0,0 +1,49 @@
+divert(-1)
+
+dnl Define macro for demux widget
+
+dnl Mux name)
+define(`N_MUXDEMUX', `MUXDEMUX'PIPELINE_ID`.'$1)
+
+dnl W_MUXDEMUX(name, mux/demux, format, periods_sink, periods_source, kcontrol_list)
+define(`W_MUXDEMUX',
+`SectionVendorTuples."'N_MUXDEMUX($1)`_tuples_w" {'
+`	tokens "sof_comp_tokens"'
+`	tuples."word" {'
+`		SOF_TKN_COMP_PERIOD_SINK_COUNT'		STR($4)
+`		SOF_TKN_COMP_PERIOD_SOURCE_COUNT'	STR($5)
+`	}'
+`}'
+`SectionData."'N_MUXDEMUX($1)`_data_w" {'
+`	tuples "'N_MUXDEMUX($1)`_tuples_w"'
+`}'
+`SectionVendorTuples."'N_MUXDEMUX($1)`_tuples_str" {'
+`	tokens "sof_comp_tokens"'
+`	tuples."string" {'
+`		SOF_TKN_COMP_FORMAT'	STR($3)
+`	}'
+`}'
+`SectionVendorTuples."'N_MUXDEMUX($1)`_mux_process_tuples_str" {'
+`	tokens "sof_process_tokens"'
+`	tuples."string" {'
+`ifelse(`$2', `0', `		SOF_TKN_PROCESS_TYPE'	"MUX", `		SOF_TKN_PROCESS_TYPE'	"DEMUX")'
+`	}'
+`}'
+`SectionData."'N_MUXDEMUX($1)`_data_str" {'
+`	tuples "'N_MUXDEMUX($1)`_tuples_str"'
+`	tuples "'N_MUXDEMUX($1)`_mux_process_tuples_str"'
+`}'
+`SectionWidget."'N_MUXDEMUX($1)`" {'
+`	index "'PIPELINE_ID`"'
+`	type "effect"'
+`	no_pm "true"'
+`	data ['
+`		"'N_MUXDEMUX($1)`_data_w"'
+`		"'N_MUXDEMUX($1)`_data_str"'
+`	]'
+`	bytes ['
+		$6
+`	]'
+`}')
+
+divert(0)dnl

tools/topology/sof-apl-demux-pcm512x.m4

@@ -0,0 +1,149 @@
+#
+# Demux topology for generic Apollolake UP^2 with pcm512x codec and HDMI.
+#
+
+# Include topology builder
+include(`utils.m4')
+include(`dai.m4')
+include(`pipeline.m4')
+include(`ssp.m4')
+
+# Include TLV library
+include(`common/tlv.m4')
+
+# Include Token library
+include(`sof/tokens.m4')
+
+# Include Apollolake DSP configuration
+include(`platform/intel/bxt.m4')
+
+DEBUG_START
+
+#
+# Define the pipelines
+#
+# PCM0 ----> demux -----> SSP5 (pcm512x)
+# PCM1 ----> volume -----> iDisp1
+# PCM2 ----> volume -----> iDisp2
+# PCM3 ----> volume -----> iDisp3
+# PCM4 <---- demux
+#
+
+dnl PIPELINE_PCM_ADD(pipeline,
+dnl     pipe id, pcm, max channels, format,
+dnl     frames, deadline, priority, core)
+# Demux pipeline 1 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-demux-playback.m4,
+	1, 0, 2, s32le,
+	48, 1000, 0, 0)
+
+# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s32le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
+	2, 1, 2, s32le,
+	48, 1000, 0, 0)
+
+# Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
+	3, 2, 2, s32le,
+	48, 1000, 0, 0)
+
+# Low Latency playback pipeline 4 on PCM 3 using max 2 channels of s32le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
+	4, 3, 2, s32le,
+	48, 1000, 0, 0)
+
+#
+# DAIs configuration
+#
+
+dnl DAI_ADD(pipeline,
+dnl     pipe id, dai type, dai_index, dai_be,
+dnl     buffer, periods, format,
+dnl     frames, deadline, priority, core)
+
+# playback DAI is SSP5 using 2 periods
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
+DAI_ADD(sof/pipe-dai-playback.m4,
+	1, SSP, 5, SSP5-Codec,
+	PIPELINE_SOURCE_1, 2, s24le,
+	48, 1000, 0, 0)
+
+# currently this dai is here as "virtual" capture backend
+W_DAI_IN(SSP, 5, SSP5-Codec, s24le, 2, 0, 0)
+
+# Capture pipeline 5 from demux on PCM 5 using max 2 channels of s32le.
+PIPELINE_PCM_ADD(sof/pipe-passthrough-capture-sched.m4,
+	5, 4, 2, s32le,
+	48, 1000, 0, 0, 0, PIPELINE_PLAYBACK_SCHED_COMP_1)
+
+# Connect demux to capture
+SectionGraph."PIPE_CAP" {
+	index "0"
+
+	lines [
+		# mux to capture
+		dapm(PIPELINE_SINK_5, PIPELINE_DEMUX_1)
+	]
+}
+
+# Connect virtual capture to dai
+SectionGraph."PIPE_CAP_VIRT" {
+	index "5"
+
+	lines [
+		# mux to capture
+		dapm(ECHO REF 5, SSP5.IN)
+	]
+}
+
+# playback DAI is iDisp1 using 2 periods
+# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
+DAI_ADD(sof/pipe-dai-playback.m4,
+	2, HDA, 0, iDisp1,
+	PIPELINE_SOURCE_2, 2, s32le,
+	48, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
+
+# playback DAI is iDisp2 using 2 periods
+# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
+DAI_ADD(sof/pipe-dai-playback.m4,
+	3, HDA, 1, iDisp2,
+	PIPELINE_SOURCE_3, 2, s32le,
+	48, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
+
+# playback DAI is iDisp3 using 2 periods
+# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
+DAI_ADD(sof/pipe-dai-playback.m4,
+	4, HDA, 2, iDisp3,
+	PIPELINE_SOURCE_4, 2, s32le,
+	48, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
+
+# PCM Low Latency, id 0
+dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
+PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1)
+PCM_PLAYBACK_ADD(HDMI1, 1, PIPELINE_PCM_2)
+PCM_PLAYBACK_ADD(HDMI2, 2, PIPELINE_PCM_3)
+PCM_PLAYBACK_ADD(HDMI3, 3, PIPELINE_PCM_4)
+PCM_CAPTURE_ADD(EchoRef, 4, PIPELINE_PCM_5)
+
+#
+# BE configurations - overrides config in ACPI if present
+#
+
+#SSP 5 (ID: 0)
+DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
+	SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+		SSP_CLOCK(bclk, 3072000, codec_slave),
+		SSP_CLOCK(fsync, 48000, codec_slave),
+		SSP_TDM(2, 32, 3, 3),
+		SSP_CONFIG_DATA(SSP, 5, 24)))
+
+# 3 HDMI/DP outputs (ID: 1,2,3)
+DAI_CONFIG(HDA, 0, 1, iDisp1)
+DAI_CONFIG(HDA, 1, 2, iDisp2)
+DAI_CONFIG(HDA, 2, 3, iDisp3)
+
+DEBUG_END