Skip to content

Commit

Permalink
tools/test/topology: mass replace codec_master -> codec_provider
Browse files Browse the repository at this point in the history 
This removes a lot of warning noise and may help spot other warnings
like `ALSA lib ops.c:48:(lookup_ops) wrong kcontrol ops value string ''`
and others.

Now that commit 1b1ec6c ("topology/cmake: skip all topologies when
alsatplg < 1.2.5") enforces alsatplg version >= 1.2.5, it is finally safe
to do this!

I compared the generated .tplg files before/after this commit and
they're bit for bit identical. Tested with  alsatplg v2.6.1 from
Ubuntu 22.

Signed-off-by: Marc Herbert <[email protected]>
  • Loading branch information
@marc-hb
marc-hb committed Nov 9, 2023
1 parent 8609ca3 commit 3fbf39a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions tools/test/topology/test-all.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT,
TEST_DAI_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
Expand Down
4 changes: 2 additions & 2 deletions tools/test/topology/test-capture.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
ifelse(TEST_DAI_TYPE, `SSP',
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)),
Expand Down
16 changes: 8 additions & 8 deletions tools/test/topology/test-playback.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ PCM_PLAYBACK_ADD(Passthrough, 0, PIPELINE_PCM_1)
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
Expand All @@ -229,8 +229,8 @@ ifdef(`TEST_HAS_PIPE2',
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI2_PORT, 1, TEST_DAI2_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI2_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
Expand All @@ -241,8 +241,8 @@ ifdef(`TEST_HAS_PIPE3',
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI3_PORT, 2, TEST_DAI3_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI3_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
Expand All @@ -253,8 +253,8 @@ ifdef(`TEST_HAS_PIPE4',
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI4_PORT, 3, TEST_DAI4_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI4_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
Expand Down
4 changes: 2 additions & 2 deletions tools/test/topology/test-tone-playback.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ DAI_ADD(sof/pipe-dai-playback.m4,
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_consumer),
SSP_CLOCK(fsync, 48000, codec_consumer),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))

0 comments on commit 3fbf39a

Please sign in to comment.