Skip to content

Commit 42e25fa

Browse files
committed
topology: sof-glk-cs42l42: using 24-bit sample on SSP2
Changing SSP2 configuration to use 24-bit sample bitwidth. Signed-off-by: Brent Lu <brent.lu@intel.com> (cherry picked from commit 44cc184dee0da1bcb9e1edd54d301b838b54c856) Signed-off-by: Brent Lu <brent.lu@intel.com>
1 parent 557bfee commit 42e25fa

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

tools/topology/sof-glk-da7219.m4

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ DAI_ADD(sof/pipe-dai-playback.m4,
8787
PIPELINE_SOURCE_1, 2, s16le,
8888
48, 1000, 0, 0)
8989

90+
ifelse(HEADPHONE, `da7219', `
9091
# playback DAI is SSP2 using 2 periods
9192
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
9293
DAI_ADD(sof/pipe-dai-playback.m4,
@@ -100,6 +101,21 @@ DAI_ADD(sof/pipe-dai-capture.m4,
100101
3, SSP, 2, SSP2-Codec,
101102
PIPELINE_SINK_3, 2, s16le,
102103
48, 1000, 0, 0)
104+
', HEADPHONE, `cs42l42', `
105+
# playback DAI is SSP2 using 2 periods
106+
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
107+
DAI_ADD(sof/pipe-dai-playback.m4,
108+
2, SSP, 2, SSP2-Codec,
109+
PIPELINE_SOURCE_2, 2, s24le,
110+
48, 1000, 0, 0)
111+
112+
# capture DAI is SSP2 using 2 periods
113+
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
114+
DAI_ADD(sof/pipe-dai-capture.m4,
115+
3, SSP, 2, SSP2-Codec,
116+
PIPELINE_SINK_3, 2, s24le,
117+
48, 1000, 0, 0)
118+
', )
103119

104120
# capture DAI is DMIC0 using 2 periods
105121
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
@@ -157,13 +173,13 @@ DAI_CONFIG(SSP, 2, 1, SSP2-Codec,
157173
SSP_TDM(2, 20, 3, 3),
158174
SSP_CONFIG_DATA(SSP, 2, 16, 1)))
159175
', HEADPHONE, `cs42l42', `
160-
#SSP 2 (ID: 1) with 19.2 MHz mclk with MCLK_ID 1 (unused), 3.072 MHz bclk
176+
#SSP 2 (ID: 1) with 19.2 MHz mclk with MCLK_ID 1 (unused), 2.4 MHz bclk
161177
DAI_CONFIG(SSP, 2, 1, SSP2-Codec,
162178
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
163179
SSP_CLOCK(bclk, 2400000, codec_slave),
164180
SSP_CLOCK(fsync, 48000, codec_slave),
165181
SSP_TDM(2, 25, 3, 3),
166-
SSP_CONFIG_DATA(SSP, 2, 16, 1, 0, SSP_CC_BCLK_ES)))
182+
SSP_CONFIG_DATA(SSP, 2, 24, 1, 0, SSP_CC_BCLK_ES)))
167183
', )
168184

169185
# dmic01 (id: 2)

0 commit comments

Comments
 (0)