Merge pull request #16 from keyonjie/master

Revert "topology: dai: correct default_hw_conf_id"

Author: lgirdwood

topology/Makefile.am

@@ -29,7 +29,8 @@ MACHINES = \
 	sof-byt-da7213.tplg \
 	sof-cnl-rt274.tplg \
 	sof-hsw-rt5640.tplg \
-	sof-apl-tdf8532.tplg
+	sof-apl-tdf8532.tplg \
+	sof-apl-pcm512x.tplg
 
 # Uncomment the following line if you want to debug conf files
 .PRECIOUS: %.conf
@@ -59,4 +60,5 @@ EXTRA_DIST = \
 	sof-byt-da7213.m4 \
 	sof-cnl-rt274.m4 \
 	sof-hsw-rt5640.m4 \
-	sof-apl-tdf8532.m4
+	sof-apl-tdf8532.m4 \
+	sof-apl-pcm512x.m4

topology/m4/dai.m4

@@ -145,7 +145,7 @@ define(`DAI_CONFIG',
 `SectionBE."'$4`" {'
 `	id "'$3`"'
 `	index "0"'
-`	default_hw_conf_id	"0"'
+`	default_hw_conf_id	"'$2`"'
 `'
 `	hw_configs ['
 `		"'$1$2`"'

topology/sof-apl-nocodec.m4

@@ -31,7 +31,7 @@ include(`platform/intel/bxt.m4')
 # PCM4 ----> volume -----> SSP4
 #      <---- Volume <----- SSP4
 # PCM5 ----> volume -----> SSP5
-#      <---- volume <----- SSP3
+#      <---- volume <----- SSP5
 #
 
 # Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s16le.

topology/sof-apl-pcm512x.m4

@@ -0,0 +1,93 @@
+#
+# Topology for generic Apollolake UP^2 with pcm512x codec.
+#
+
+# 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')
+include(`platform/intel/dmic.m4')
+
+#
+# Define the pipelines
+#
+# PCM0 <---- volume <----- DMIC0 (SSP3)
+# PCM1 ----> volume -----> SSP5 (pcm512x)
+#      <---- volume <----- SSP5
+#
+
+# Low Latency capture pipeline 1 on PCM 0 using max 4 channels of s32le.
+# Schedule 48 frames per 1000us deadline on core 0 with priority 0
+PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
+	1, 0, 4, s32le,
+	48, 1000, 0, 0, DMIC, 0, s32le, 2)
+
+# Low Latency playback pipeline 2 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,
+	2, 1, 2, s16le,
+	48, 1000, 0, 0, SSP, 5, s16le, 2)
+
+# Low Latency capture 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-capture.m4,
+	3, 1, 2, s16le,
+	48, 1000, 0, 0, SSP, 5, s16le, 2)
+
+
+#
+# DAIs configuration
+#
+
+# capture DAI is DMIC0 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,
+	1, DMIC, 0, DMIC0,
+	PIPELINE_SINK_1, 2, s32le,
+	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,
+	2, SSP, 5, SSP5-Codec,
+	PIPELINE_SOURCE_2, 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,
+	3, SSP, 5, SSP5-Codec,
+	PIPELINE_SINK_3, 2, s16le,
+	48, 1000, 0, 0)
+
+
+# PCM Low Latency, id 0
+PCM_CAPTURE_ADD(Dmic0, 0, 0, 0, PIPELINE_PCM_1)
+PCM_DUPLEX_ADD(Port5, 1, 1, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)
+
+#
+# BE configurations - overrides config in ACPI if present
+#
+
+DAI_CONFIG(DMIC, 0, 0, DMIC0,
+	DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
+		DMIC_WORD_LENGTH(s32le), DMIC, 0,
+		PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1)))
+
+DAI_CONFIG(SSP, 5, 1, SSP5-Codec,
+	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)))
+