Skip to content

Commit 15a7774

Browse files
marc-hblgirdwood
marc-hb
authored and
lgirdwood
committed
Revert "topologies: switch all .m4 files to codec_provider and codec_consumer"
This reverts commit f50b6fe. I discovered the hard way that this change causes alsatplg version 1.2.2 (the default version in the current LTS Ubuntu) to corrupt just a few bytes in .tplg output in an incredibly discrete and time-consuming way: no error message at build time and same file size. See example at thesofproject#5162. We could/should just require a minimum alsatplg version at the CMake level but at this moment we don't even know which minimum version is needed and we would also need to take some time to test a few alsatplg versions. If version 1.2.2 would just fail with an decent error message that can be searched and discussed then everything would be fine but silent corruption is really not OK. So users of recent versions will unfortunately have to live with the huge number of warnings for now. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent 64c7b98 commit 15a7774

75 files changed

Lines changed: 225 additions & 225 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎tools/test/topology/test-all.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT,
9090
TEST_DAI_LINK_NAME,
9191
SSP_CONFIG(TEST_SSP_MODE,
9292
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
93-
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
94-
SSP_CLOCK(fsync, 48000, codec_consumer),
93+
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
94+
SSP_CLOCK(fsync, 48000, codec_slave),
9595
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
9696
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
9797
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))

‎tools/test/topology/test-capture.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
7878
ifelse(TEST_DAI_TYPE, `SSP',
7979
SSP_CONFIG(TEST_SSP_MODE,
8080
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
81-
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
82-
SSP_CLOCK(fsync, 48000, codec_consumer),
81+
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
82+
SSP_CLOCK(fsync, 48000, codec_slave),
8383
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
8484
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
8585
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)),

‎tools/test/topology/test-playback.m4‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ PCM_PLAYBACK_ADD(Passthrough, 0, PIPELINE_PCM_1)
215215
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
216216
SSP_CONFIG(TEST_SSP_MODE,
217217
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
218-
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
219-
SSP_CLOCK(fsync, 48000, codec_consumer),
218+
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
219+
SSP_CLOCK(fsync, 48000, codec_slave),
220220
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
221221
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
222222
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
@@ -226,8 +226,8 @@ ifdef(`TEST_HAS_PIPE2',
226226
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI2_PORT, 1, TEST_DAI2_LINK_NAME,
227227
SSP_CONFIG(TEST_SSP_MODE,
228228
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
229-
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
230-
SSP_CLOCK(fsync, 48000, codec_consumer),
229+
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
230+
SSP_CLOCK(fsync, 48000, codec_slave),
231231
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
232232
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI2_PORT,
233233
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
@@ -238,8 +238,8 @@ ifdef(`TEST_HAS_PIPE3',
238238
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI3_PORT, 2, TEST_DAI3_LINK_NAME,
239239
SSP_CONFIG(TEST_SSP_MODE,
240240
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
241-
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
242-
SSP_CLOCK(fsync, 48000, codec_consumer),
241+
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
242+
SSP_CLOCK(fsync, 48000, codec_slave),
243243
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
244244
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI3_PORT,
245245
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
@@ -250,8 +250,8 @@ ifdef(`TEST_HAS_PIPE4',
250250
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI4_PORT, 3, TEST_DAI4_LINK_NAME,
251251
SSP_CONFIG(TEST_SSP_MODE,
252252
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
253-
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
254-
SSP_CLOCK(fsync, 48000, codec_consumer),
253+
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
254+
SSP_CLOCK(fsync, 48000, codec_slave),
255255
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
256256
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI4_PORT,
257257
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))

‎tools/test/topology/test-tone-playback.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ DAI_ADD(sof/pipe-dai-playback.m4,
6464
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
6565
SSP_CONFIG(TEST_SSP_MODE,
6666
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
67-
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
68-
SSP_CLOCK(fsync, 48000, codec_consumer),
67+
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
68+
SSP_CLOCK(fsync, 48000, codec_slave),
6969
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
7070
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
7171
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))

‎tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ PCM_CAPTURE_ADD(DMIC16kHz, 6, PIPELINE_PCM_3)
9797
#SSP 5 (ID: 0)
9898
DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
9999
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
100-
SSP_CLOCK(bclk, 3072000, codec_consumer),
101-
SSP_CLOCK(fsync, 48000, codec_consumer),
100+
SSP_CLOCK(bclk, 3072000, codec_slave),
101+
SSP_CLOCK(fsync, 48000, codec_slave),
102102
SSP_TDM(2, 32, 3, 3),
103103
SSP_CONFIG_DATA(SSP, 5, 24)))
104104

‎tools/topology/topology1/development/sof-apl-asrc-wm8804.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ PCM_DUPLEX_ADD(Port5, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
7878

7979
DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
8080
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
81-
SSP_CLOCK(bclk, 3072000, codec_provider),
82-
SSP_CLOCK(fsync, 48000, codec_provider),
81+
SSP_CLOCK(bclk, 3072000, codec_master),
82+
SSP_CLOCK(fsync, 48000, codec_master),
8383
SSP_TDM(2, 32, 3, 3),
8484
SSP_CONFIG_DATA(SSP, 5, 24)))
8585

‎tools/topology/topology1/development/sof-apl-nocodec-ci.m4‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -268,44 +268,44 @@ dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config)
268268
DAI_CONFIG(SSP, 0, 0, NoCodec-0,
269269
dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data)
270270
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
271-
SSP_CLOCK(bclk, 1536000, codec_consumer),
272-
SSP_CLOCK(fsync, 48000, codec_consumer),
271+
SSP_CLOCK(bclk, 1536000, codec_slave),
272+
SSP_CLOCK(fsync, 48000, codec_slave),
273273
SSP_TDM(2, 16, 3, 3),
274274
dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks)
275275
SSP_CONFIG_DATA(SSP, 0, 16, 0, SSP_QUIRK_LBM)))
276276

277277
DAI_CONFIG(SSP, 1, 1, NoCodec-1,
278278
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
279-
SSP_CLOCK(bclk, 1536000, codec_consumer),
280-
SSP_CLOCK(fsync, 48000, codec_consumer),
279+
SSP_CLOCK(bclk, 1536000, codec_slave),
280+
SSP_CLOCK(fsync, 48000, codec_slave),
281281
SSP_TDM(2, 16, 3, 3),
282282
SSP_CONFIG_DATA(SSP, 1, 16, 0, SSP_QUIRK_LBM)))
283283

284284
#DAI_CONFIG(SSP, 2, 2, NoCodec-2,
285285
# SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
286-
# SSP_CLOCK(bclk, 1536000, codec_consumer),
287-
# SSP_CLOCK(fsync, 48000, codec_consumer),
286+
# SSP_CLOCK(bclk, 1536000, codec_slave),
287+
# SSP_CLOCK(fsync, 48000, codec_slave),
288288
# SSP_TDM(2, 16, 3, 3),
289289
# SSP_CONFIG_DATA(SSP, 2, 16, 0, SSP_QUIRK_LBM)))
290290

291291
DAI_CONFIG(SSP, 3, 3, NoCodec-3,
292292
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
293-
SSP_CLOCK(bclk, 1536000, codec_consumer),
294-
SSP_CLOCK(fsync, 48000, codec_consumer),
293+
SSP_CLOCK(bclk, 1536000, codec_slave),
294+
SSP_CLOCK(fsync, 48000, codec_slave),
295295
SSP_TDM(2, 16, 3, 3),
296296
SSP_CONFIG_DATA(SSP, 3, 16, 0, SSP_QUIRK_LBM)))
297297

298298
#DAI_CONFIG(SSP, 4, 4, NoCodec-4,
299299
# SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
300-
# SSP_CLOCK(bclk, 1536000, codec_consumer),
301-
# SSP_CLOCK(fsync, 48000, codec_consumer),
300+
# SSP_CLOCK(bclk, 1536000, codec_slave),
301+
# SSP_CLOCK(fsync, 48000, codec_slave),
302302
# SSP_TDM(2, 16, 3, 3),
303303
# SSP_CONFIG_DATA(SSP, 4, 16, 0, SSP_QUIRK_LBM)))
304304

305305
DAI_CONFIG(SSP, 5, 5, NoCodec-5,
306306
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
307-
SSP_CLOCK(bclk, 1536000, codec_consumer),
308-
SSP_CLOCK(fsync, 48000, codec_consumer),
307+
SSP_CLOCK(bclk, 1536000, codec_slave),
308+
SSP_CLOCK(fsync, 48000, codec_slave),
309309
SSP_TDM(2, 16, 3, 3),
310310
SSP_CONFIG_DATA(SSP, 5, 16, 0, SSP_QUIRK_LBM)))
311311

‎tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config)
106106
DAI_CONFIG(SSP, 0, 0, NoCodec-0,
107107
dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data)
108108
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
109-
SSP_CLOCK(bclk, 6144000, codec_consumer),
110-
SSP_CLOCK(fsync, 48000, codec_consumer),
109+
SSP_CLOCK(bclk, 6144000, codec_slave),
110+
SSP_CLOCK(fsync, 48000, codec_slave),
111111
SSP_TDM(4, 32, 15, 15),
112112
dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks)
113113
SSP_CONFIG_DATA(SSP, 0, 32, 0, SSP_QUIRK_LBM)))

‎tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config)
106106
DAI_CONFIG(SSP, 0, 0, NoCodec-0,
107107
dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data)
108108
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
109-
SSP_CLOCK(bclk, 6144000, codec_consumer),
110-
SSP_CLOCK(fsync, 48000, codec_consumer),
109+
SSP_CLOCK(bclk, 6144000, codec_slave),
110+
SSP_CLOCK(fsync, 48000, codec_slave),
111111
SSP_TDM(4, 32, 15, 15),
112112
dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks)
113113
SSP_CONFIG_DATA(SSP, 0, 32, 0, SSP_QUIRK_LBM)))

‎tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1)
7474
#SSP 5 (ID: 0)
7575
DAI_CONFIG(SSP, 5, 0, SSP5-Codec,
7676
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
77-
SSP_CLOCK(bclk, 3072000, codec_consumer),
78-
SSP_CLOCK(fsync, 48000, codec_consumer),
77+
SSP_CLOCK(bclk, 3072000, codec_slave),
78+
SSP_CLOCK(fsync, 48000, codec_slave),
7979
SSP_TDM(2, 32, 3, 3),
8080
SSP_CONFIG_DATA(SSP, 5, 24)))
8181

0 commit comments

Comments
 (0)