Skip to content
This repository was archived by the owner on Jan 17, 2019. It is now read-only.

Commit f85f5f8

Browse files
Wu Zhiganglrgirdwo
authored andcommitted
topology: enable ssp2 for capture feature.
the ssp2 should be tdm8-32bit. Signed-off-by: Wu Zhigang <zhigang.wu@linux.intel.com>
1 parent b322168 commit f85f5f8

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

topology/sof-apl-tdf8532.m4

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
3838
1, 0, 4, s32le,
3939
48, 1000, 0, 0, 0, 1, SSP, 4, s32le, 2)
4040

41-
# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s16le.
41+
# Low Latency playback pipeline 2 on PCM 1 using max 8 channels of s32le.
4242
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
4343
# Use DMAC 0 channel 1 for PCM audio playback data
4444
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
45-
2, 1, 2, s16le,
46-
48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2)
45+
2, 1, 8, s32le,
46+
48, 1000, 0, 0, 0, 1, SSP, 2, s32le, 2)
4747

48-
# Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s16le.
48+
# Low Latency capture pipeline 3 on PCM 1 using max 8 channels of s32le.
4949
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
5050
# Use DMAC 0 channel 1 for PCM audio playback data
5151
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
52-
3, 1, 2, s16le,
53-
48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2)
52+
3, 1, 8, s32le,
53+
48, 1000, 0, 0, 0, 1, SSP, 2, s32le, 2)
5454

5555
# Low Latency playback pipeline 4 on PCM 2 using max 2 channels of s16le.
5656
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
@@ -114,17 +114,17 @@ DAI_ADD(sof/pipe-dai-playback.m4,
114114
48, 1000, 0, 0)
115115

116116
# playback DAI is SSP2 using 2 periods
117-
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
117+
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
118118
DAI_ADD(sof/pipe-dai-playback.m4,
119119
2, SSP, 2, SSP2-Codec,
120-
PIPELINE_SOURCE_2, 2, s16le,
120+
PIPELINE_SOURCE_2, 2, s32le,
121121
48, 1000, 0, 0)
122122

123123
# capture DAI is SSP2 using 2 periods
124-
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
124+
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
125125
DAI_ADD(sof/pipe-dai-capture.m4,
126126
3, SSP, 2, SSP2-Codec,
127-
PIPELINE_SINK_3, 2, s16le,
127+
PIPELINE_SINK_3, 2, s32le,
128128
48, 1000, 0, 0)
129129

130130
# playback DAI is SSP0 using 2 periods
@@ -196,11 +196,11 @@ DAI_CONFIG(SSP, 4, 4, SSP4-Codec,
196196
SSP_SAMPLE_BITS(SSP, 4, 32)))
197197

198198
DAI_CONFIG(SSP, 2, 2, SSP2-Codec,
199-
SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
200-
DAI_CLOCK(bclk, 1536000, codec_slave),
199+
SSP_CONFIG(DSP_B, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
200+
DAI_CLOCK(bclk, 12288000, codec_slave),
201201
DAI_CLOCK(fsync, 48000, codec_slave),
202-
DAI_TDM(2, 16, 3, 3),
203-
SSP_SAMPLE_BITS(SSP, 2, 16)))
202+
DAI_TDM(2, 32, 255, 255),
203+
SSP_SAMPLE_BITS(SSP, 2, 32)))
204204

205205
DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
206206
SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),

0 commit comments

Comments
 (0)