Merge pull request #90 from singalsu/fix_nocodec_dmic_pcm

lgirdwood · web-flow · commit b3764048e9b9 · 2018-10-18T11:20:44.000+01:00
Topology: DMIC: Reduce PCM capabilities to DMIC configuration
diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4
@@ -112,10 +112,10 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
 	12, 5, 2, s16le,
 	48, 1000, 0, 0)
 
-# Passthrough capture pipeline 13 on PCM 6 using max 4 channels.
+# Passthrough capture pipeline 13 on PCM 6 using max 2 channels.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
-	13, 6, 4, s32le,
+	13, 6, 2, s32le,
 	48, 1000, 0, 0)
 
 #
diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4
@@ -44,4 +44,4 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID
 # PCM Configuration
 #
 
-PCM_CAPABILITIES(Passthrough Capture PCM_ID, COMP_FORMAT_NAME(PIPELINE_FORMAT), 8000, 192000, 1, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)
+PCM_CAPABILITIES(Passthrough Capture PCM_ID, COMP_FORMAT_NAME(PIPELINE_FORMAT), 48000, 48000,  PIPELINE_CHANNELS, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)

Original file line number	Diff line number	Diff line change
@@ -44,4 +44,4 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID
`44`	`44`	`# PCM Configuration`
`45`	`45`	`#`
`46`	`46`
`47`		`-PCM_CAPABILITIES(Passthrough Capture PCM_ID, COMP_FORMAT_NAME(PIPELINE_FORMAT), 8000, 192000, 1, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)`
	`47`	`+PCM_CAPABILITIES(Passthrough Capture PCM_ID, COMP_FORMAT_NAME(PIPELINE_FORMAT), 48000, 48000, PIPELINE_CHANNELS, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)`