From 9bed77f2847cc713d6699f6ac4cd79eda8b416bc Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Wed, 12 Jan 2022 01:43:56 +0000 Subject: [PATCH] Revert "topologies: switch all .m4 files to codec_provider and codec_consumer" This reverts commit f50b6fe0adc440a5b0d93054372adec74f0a013f. 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 https://github.com/thesofproject/sof/pull/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 --- tools/test/topology/test-all.m4 | 4 +-- tools/test/topology/test-capture.m4 | 4 +-- tools/test/topology/test-playback.m4 | 16 ++++----- tools/test/topology/test-tone-playback.m4 | 4 +-- .../development/sof-apl-asrc-pcm512x.m4 | 4 +-- .../development/sof-apl-asrc-wm8804.m4 | 4 +-- .../development/sof-apl-nocodec-ci.m4 | 24 ++++++------- .../sof-apl-nocodec-demux-eq-2ch4ch.m4 | 4 +-- .../sof-apl-nocodec-demux-eq-4ch4ch.m4 | 4 +-- .../development/sof-apl-pcm512x-nohdmi.m4 | 4 +-- .../development/sof-apl-src-50khz-pcm512x.m4 | 4 +-- .../sof-cml-rt1011-rt5682-nokwd.m4 | 8 ++--- .../development/sof-cml-src-rt5682.m4 | 4 +-- .../development/sof-imx8-compr-aac-wm8960.m4 | 4 +-- .../development/sof-imx8-compr-mp3-wm8960.m4 | 4 +-- .../development/sof-imx8-src-cs42888.m4 | 4 +-- .../development/sof-imx8-src-wm8960.m4 | 4 +-- .../sof-imx8mp-compr-aac-wm8960.m4 | 4 +-- .../sof-imx8mp-compr-mp3-wm8960.m4 | 4 +-- .../development/sof-imx8mp-src-wm8960.m4 | 4 +-- .../development/sof-tgl-nocodec-ci.m4 | 8 ++--- .../topology1/platform/common/acp-sp.m4 | 2 +- .../topology1/platform/common/esai.m4 | 2 +- .../topology/topology1/platform/common/sai.m4 | 2 +- .../topology/topology1/platform/common/ssp.m4 | 2 +- .../platform/intel/intel-generic-bt.m4 | 12 +++---- .../topology1/platform/intel/jsl-dedede.m4 | 4 +-- .../topology1/platform/intel/jsl-rt1015.m4 | 4 +-- .../topology/topology1/platform/intel/jsl.m4 | 4 +-- tools/topology/topology1/sof-acp-renoir.m4 | 4 +-- tools/topology/topology1/sof-adl-nau8825.m4 | 10 +++--- tools/topology/topology1/sof-apl-da7219.m4 | 8 ++--- .../topology1/sof-apl-demux-pcm512x.m4 | 4 +-- tools/topology/topology1/sof-apl-pcm512x.m4 | 8 ++--- tools/topology/topology1/sof-apl-rt298.m4 | 4 +-- tools/topology/topology1/sof-apl-tdf8532.m4 | 24 ++++++------- tools/topology/topology1/sof-apl-wm8804.m4 | 4 +-- tools/topology/topology1/sof-bdw-codec.m4 | 4 +-- tools/topology/topology1/sof-bdw-nocodec.m4 | 4 +-- tools/topology/topology1/sof-byt-codec.m4 | 4 +-- tools/topology/topology1/sof-cavs-nocodec.m4 | 36 +++++++++---------- tools/topology/topology1/sof-cht-max98090.m4 | 4 +-- tools/topology/topology1/sof-cht-nocodec.m4 | 4 +-- .../sof-cml-demux-rt5682-max98357a.m4 | 4 +-- .../topology1/sof-cml-demux-rt5682.m4 | 4 +-- .../topology1/sof-cml-rt1011-rt5682.m4 | 4 +-- .../topology/topology1/sof-cml-rt5682-kwd.m4 | 4 +-- .../topology1/sof-cml-rt5682-max98357a.m4 | 4 +-- tools/topology/topology1/sof-cml-rt5682.m4 | 4 +-- tools/topology/topology1/sof-cnl-rt274.m4 | 4 +-- tools/topology/topology1/sof-ehl-rt5660.m4 | 4 +-- .../topology/topology1/sof-glk-da7219-kwd.m4 | 8 ++--- tools/topology/topology1/sof-glk-da7219.m4 | 12 +++---- tools/topology/topology1/sof-glk-es8336.m4 | 4 +-- tools/topology/topology1/sof-glk-rt5682.m4 | 8 ++--- .../topology1/sof-imx8-compr-wm8960-mixer.m4 | 4 +-- .../topology1/sof-imx8-cs42888-mixer.m4 | 4 +-- tools/topology/topology1/sof-imx8-cs42888.m4 | 4 +-- .../topology1/sof-imx8-nocodec-sai.m4 | 4 +-- tools/topology/topology1/sof-imx8-nocodec.m4 | 4 +-- .../topology/topology1/sof-imx8-wm8960-kwd.m4 | 4 +-- .../topology1/sof-imx8-wm8960-mixer.m4 | 4 +-- tools/topology/topology1/sof-imx8-wm8960.m4 | 4 +-- .../sof-imx8mp-compr-wm8960-mixer.m4 | 4 +-- .../topology1/sof-imx8mp-wm8960-kwd.m4 | 4 +-- .../topology1/sof-imx8mp-wm8960-mixer.m4 | 4 +-- tools/topology/topology1/sof-imx8mp-wm8960.m4 | 4 +-- tools/topology/topology1/sof-imx8ulp-btsco.m4 | 4 +-- tools/topology/topology1/sof-jsl-da7219.m4 | 6 ++-- tools/topology/topology1/sof-jsl-rt5682.m4 | 6 ++-- .../topology1/sof-rn-rt5682-max98360.m4 | 4 +-- .../topology1/sof-rn-rt5682-rt1019.m4 | 4 +-- .../topology/topology1/sof-smart-amplifier.m4 | 4 +-- .../topology1/sof-tgl-max98357a-rt5682.m4 | 26 +++++++------- .../topology1/sof-tgl-max98373-rt5682.m4 | 6 ++-- 75 files changed, 225 insertions(+), 225 deletions(-) diff --git a/tools/test/topology/test-all.m4 b/tools/test/topology/test-all.m4 index d6ad20fd633c..fd0404c5fa6e 100644 --- a/tools/test/topology/test-all.m4 +++ b/tools/test/topology/test-all.m4 @@ -90,8 +90,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_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), 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))) diff --git a/tools/test/topology/test-capture.m4 b/tools/test/topology/test-capture.m4 index 8458b24e8bde..ff10dde0fe34 100644 --- a/tools/test/topology/test-capture.m4 +++ b/tools/test/topology/test-capture.m4 @@ -78,8 +78,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_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), 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)), diff --git a/tools/test/topology/test-playback.m4 b/tools/test/topology/test-playback.m4 index 97e5178a9320..7d5f65b6dd85 100644 --- a/tools/test/topology/test-playback.m4 +++ b/tools/test/topology/test-playback.m4 @@ -215,8 +215,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_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), 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))) @@ -226,8 +226,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_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), 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))) @@ -238,8 +238,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_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), 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))) @@ -250,8 +250,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_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), 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))) diff --git a/tools/test/topology/test-tone-playback.m4 b/tools/test/topology/test-tone-playback.m4 index 6007b5381221..5f3f8d2e02b1 100644 --- a/tools/test/topology/test-tone-playback.m4 +++ b/tools/test/topology/test-tone-playback.m4 @@ -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_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), 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))) diff --git a/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 b/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 index 5dd8193af54e..55ded863956b 100644 --- a/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 +++ b/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 @@ -97,8 +97,8 @@ PCM_CAPTURE_ADD(DMIC16kHz, 6, PIPELINE_PCM_3) #SSP 5 (ID: 0) DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) diff --git a/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 b/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 index c596d651c37f..8ed5e009e88b 100644 --- a/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 +++ b/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 @@ -78,8 +78,8 @@ PCM_DUPLEX_ADD(Port5, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_provider), - SSP_CLOCK(fsync, 48000, codec_provider), + SSP_CLOCK(bclk, 3072000, codec_master), + SSP_CLOCK(fsync, 48000, codec_master), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) diff --git a/tools/topology/topology1/development/sof-apl-nocodec-ci.m4 b/tools/topology/topology1/development/sof-apl-nocodec-ci.m4 index e41a0c45d981..b8d063fea9d2 100644 --- a/tools/topology/topology1/development/sof-apl-nocodec-ci.m4 +++ b/tools/topology/topology1/development/sof-apl-nocodec-ci.m4 @@ -268,44 +268,44 @@ dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) DAI_CONFIG(SSP, 0, 0, NoCodec-0, dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks) SSP_CONFIG_DATA(SSP, 0, 16, 0, SSP_QUIRK_LBM))) DAI_CONFIG(SSP, 1, 1, NoCodec-1, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 1, 16, 0, SSP_QUIRK_LBM))) #DAI_CONFIG(SSP, 2, 2, NoCodec-2, # SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), -# SSP_CLOCK(bclk, 1536000, codec_consumer), -# SSP_CLOCK(fsync, 48000, codec_consumer), +# SSP_CLOCK(bclk, 1536000, codec_slave), +# SSP_CLOCK(fsync, 48000, codec_slave), # SSP_TDM(2, 16, 3, 3), # SSP_CONFIG_DATA(SSP, 2, 16, 0, SSP_QUIRK_LBM))) DAI_CONFIG(SSP, 3, 3, NoCodec-3, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 3, 16, 0, SSP_QUIRK_LBM))) #DAI_CONFIG(SSP, 4, 4, NoCodec-4, # SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), -# SSP_CLOCK(bclk, 1536000, codec_consumer), -# SSP_CLOCK(fsync, 48000, codec_consumer), +# SSP_CLOCK(bclk, 1536000, codec_slave), +# SSP_CLOCK(fsync, 48000, codec_slave), # SSP_TDM(2, 16, 3, 3), # SSP_CONFIG_DATA(SSP, 4, 16, 0, SSP_QUIRK_LBM))) DAI_CONFIG(SSP, 5, 5, NoCodec-5, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 5, 16, 0, SSP_QUIRK_LBM))) diff --git a/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4 b/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4 index a3cde5d643dd..f3d796e9916c 100644 --- a/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4 +++ b/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4 @@ -106,8 +106,8 @@ dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) DAI_CONFIG(SSP, 0, 0, NoCodec-0, dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 6144000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 6144000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(4, 32, 15, 15), dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks) SSP_CONFIG_DATA(SSP, 0, 32, 0, SSP_QUIRK_LBM))) diff --git a/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4 b/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4 index 08b6393297f9..9479b1a4bf47 100644 --- a/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4 +++ b/tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4 @@ -106,8 +106,8 @@ dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) DAI_CONFIG(SSP, 0, 0, NoCodec-0, dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 6144000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 6144000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(4, 32, 15, 15), dnl SSP_CONFIG_DATA(type, dai_index, valid bits, mclk_id, quirks) SSP_CONFIG_DATA(SSP, 0, 32, 0, SSP_QUIRK_LBM))) diff --git a/tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 b/tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 index a3ccc68e1d70..4e3814745ac6 100644 --- a/tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 +++ b/tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 @@ -74,8 +74,8 @@ PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1) #SSP 5 (ID: 0) DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) diff --git a/tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 b/tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 index 8a4ad74b66ba..4833bca55f30 100644 --- a/tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 +++ b/tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 @@ -66,8 +66,8 @@ PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1) #SSP 5 (ID: 0) DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 3200000, codec_consumer), - SSP_CLOCK(fsync, 50000, codec_consumer), + SSP_CLOCK(bclk, 3200000, codec_slave), + SSP_CLOCK(fsync, 50000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) diff --git a/tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 b/tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 index 542645f0fc7f..16aaf5b82923 100644 --- a/tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 +++ b/tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 @@ -180,15 +180,15 @@ PCM_PLAYBACK_ADD(Speakers, 5, PIPELINE_PCM_7) #SSP SSP_INDEX (ID: 0) DAI_CONFIG(SSP, SSP_INDEX, 0, SSP_NAME, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP_INDEX, 24))) DAI_CONFIG(SSP, SSP1_INDEX, 6, SSP1_NAME, SSP_CONFIG(DSP_A, SSP_CLOCK(mclk, SSP1_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, 4800000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 4800000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(4, 25, 3, 15), SSP_CONFIG_DATA(SET_SSP1_CONFIG_DATA))) diff --git a/tools/topology/topology1/development/sof-cml-src-rt5682.m4 b/tools/topology/topology1/development/sof-cml-src-rt5682.m4 index b24b744882c4..6358e7582bb3 100644 --- a/tools/topology/topology1/development/sof-cml-src-rt5682.m4 +++ b/tools/topology/topology1/development/sof-cml-src-rt5682.m4 @@ -145,8 +145,8 @@ PCM_PLAYBACK_ADD(HDMI3, 4, PIPELINE_PCM_6) #SSP 1 (ID: 0) DAI_CONFIG(SSP, 1, 0, SSP1-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 1, 24))) diff --git a/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 index 4e5db8897eb4..a11ba177962d 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 @@ -88,7 +88,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1) dnl DAI_CONFIG(type, idx, link_id, name, sai_config) DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 index 1c7059d24ef5..ab9f31bcd427 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 @@ -88,7 +88,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1) dnl DAI_CONFIG(type, idx, link_id, name, sai_config) DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 b/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 index ddc16a80d632..3de6e81267cd 100644 --- a/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 +++ b/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 @@ -76,7 +76,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) dnl DAI_CONFIG(type, idx, link_id, name, esai_config) DAI_CONFIG(ESAI, 0, 0, esai0-cs42888, ESAI_CONFIG(I2S, ESAI_CLOCK(mclk, 49152000, codec_mclk_in), - ESAI_CLOCK(bclk, 3072000, codec_consumer), - ESAI_CLOCK(fsync, 48000, codec_consumer), + ESAI_CLOCK(bclk, 3072000, codec_slave), + ESAI_CLOCK(fsync, 48000, codec_slave), ESAI_TDM(2, 32, 3, 3), ESAI_CONFIG_DATA(ESAI, 0, 0))) diff --git a/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 index 57fc340e0ec6..c2d578c3ff09 100644 --- a/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 @@ -76,7 +76,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) dnl DAI_CONFIG(type, idx, link_id, name, sai_config) DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 index 4a477462fccd..8b0f0dc59b36 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 @@ -89,7 +89,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1) dnl DAI_CONFIG(type, idx, link_id, name, sai_config) DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 index 576f757eb7b6..d18970b1a295 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 @@ -88,7 +88,7 @@ COMPR_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1) dnl DAI_CONFIG(type, idx, link_id, name, sai_config) DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 index 010d5f7755d4..454b3329df74 100644 --- a/tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 @@ -76,7 +76,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) dnl DAI_CONFIG(type, idx, link_id, name, sai_config) DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 b/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 index 7eb918574c89..c53242f9a73d 100644 --- a/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 +++ b/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 @@ -247,15 +247,15 @@ PCM_CAPTURE_ADD(DMIC16kHz, 5, PIPELINE_PCM_9) DAI_CONFIG(SSP, 0, 0, NoCodec-0, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 38400000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 24, 0, SSP_QUIRK_LBM))) DAI_CONFIG(SSP, 1, 1, NoCodec-1, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 38400000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 1, 24, 0, SSP_QUIRK_LBM))) diff --git a/tools/topology/topology1/platform/common/acp-sp.m4 b/tools/topology/topology1/platform/common/acp-sp.m4 index c171a354576b..3d57240a248c 100644 --- a/tools/topology/topology1/platform/common/acp-sp.m4 +++ b/tools/topology/topology1/platform/common/acp-sp.m4 @@ -2,7 +2,7 @@ divert(-1) dnl ACPSP related macros -dnl ACP_CLOCK(clock, freq, codec_provider, polarity) +dnl ACP_CLOCK(clock, freq, codec_master, polarity) dnl polarity is optional define(`ACP_CLOCK', $1 STR($3) diff --git a/tools/topology/topology1/platform/common/esai.m4 b/tools/topology/topology1/platform/common/esai.m4 index 7b44caf5d8fb..9dd1b4c845cd 100644 --- a/tools/topology/topology1/platform/common/esai.m4 +++ b/tools/topology/topology1/platform/common/esai.m4 @@ -2,7 +2,7 @@ divert(-1) dnl ESAI related macros -dnl ESAI_CLOCK(clock, freq, codec_provider, polarity) +dnl ESAI_CLOCK(clock, freq, codec_master, polarity) dnl polarity is optional define(`ESAI_CLOCK', $1 STR($3) diff --git a/tools/topology/topology1/platform/common/sai.m4 b/tools/topology/topology1/platform/common/sai.m4 index 5acbb714a553..9697aa374bd6 100644 --- a/tools/topology/topology1/platform/common/sai.m4 +++ b/tools/topology/topology1/platform/common/sai.m4 @@ -2,7 +2,7 @@ divert(-1) dnl SAI related macros -dnl SAI_CLOCK(clock, freq, codec_provider, polarity) +dnl SAI_CLOCK(clock, freq, codec_master, polarity) dnl polarity is optional define(`SAI_CLOCK', $1 STR($3) diff --git a/tools/topology/topology1/platform/common/ssp.m4 b/tools/topology/topology1/platform/common/ssp.m4 index be4df2610a18..39a5ba185b0f 100644 --- a/tools/topology/topology1/platform/common/ssp.m4 +++ b/tools/topology/topology1/platform/common/ssp.m4 @@ -2,7 +2,7 @@ divert(-1) dnl SSP related macros -dnl SSP_CLOCK(clock, freq, codec_provider, polarity) +dnl SSP_CLOCK(clock, freq, codec_master, polarity) dnl polarity is optional define(`SSP_CLOCK', $1 STR($3) diff --git a/tools/topology/topology1/platform/intel/intel-generic-bt.m4 b/tools/topology/topology1/platform/intel/intel-generic-bt.m4 index 5616a5641b8a..48c9456da71b 100644 --- a/tools/topology/topology1/platform/intel/intel-generic-bt.m4 +++ b/tools/topology/topology1/platform/intel/intel-generic-bt.m4 @@ -62,18 +62,18 @@ define(`data_names', DAI_DATA_NAMES(LIST(` ', "ssp_data1", "ssp_data2", "ssp # Note WB is put as default in the list define(`ssp_config_list_1', LIST(`', `MULTI_SSP_CONFIG(hw_config1, HW_CONFIG_ID, DSP_A, SSP_CLOCK(mclk, BT_MCLK, codec_mclk_in),' - `SSP_CLOCK(bclk, 256000, codec_provider, inverted),' - `SSP_CLOCK(fsync, 16000, codec_provider),' + `SSP_CLOCK(bclk, 256000, codec_master, inverted),' + `SSP_CLOCK(fsync, 16000, codec_master),' `SSP_TDM(1, 16, 1, 1),' `SSP_MULTI_CONFIG_DATA(ssp_data1, 16))', `MULTI_SSP_CONFIG(hw_config2, eval(HW_CONFIG_ID + 1), DSP_A, SSP_CLOCK(mclk, BT_MCLK, codec_mclk_in),' - `SSP_CLOCK(bclk, 128000, codec_provider, inverted),' - `SSP_CLOCK(fsync, 8000, codec_provider),' + `SSP_CLOCK(bclk, 128000, codec_master, inverted),' + `SSP_CLOCK(fsync, 8000, codec_master),' `SSP_TDM(1, 16, 1, 1),' `SSP_MULTI_CONFIG_DATA(ssp_data2, 16))', `MULTI_SSP_CONFIG(hw_config3, eval(HW_CONFIG_ID + 2), DSP_A, SSP_CLOCK(mclk, BT_MCLK, codec_mclk_in),' - `SSP_CLOCK(bclk, 1536000, codec_consumer),' - `SSP_CLOCK(fsync, 48000, codec_consumer),' + `SSP_CLOCK(bclk, 1536000, codec_slave),' + `SSP_CLOCK(fsync, 48000, codec_slave),' `SSP_TDM(2, 16, 3, 0),' `SSP_MULTI_CONFIG_DATA(ssp_data3, 16))')) diff --git a/tools/topology/topology1/platform/intel/jsl-dedede.m4 b/tools/topology/topology1/platform/intel/jsl-dedede.m4 index 112029ba7f5d..137d805e6836 100644 --- a/tools/topology/topology1/platform/intel/jsl-dedede.m4 +++ b/tools/topology/topology1/platform/intel/jsl-dedede.m4 @@ -12,7 +12,7 @@ define(`SPK_DATA_FORMAT', `s24le') define(`SET_SSP_CONFIG', `SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 2304000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2304000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 24, 3, 3), SSP_CONFIG_DATA(SSP, SPK_INDEX, 24, 0))') diff --git a/tools/topology/topology1/platform/intel/jsl-rt1015.m4 b/tools/topology/topology1/platform/intel/jsl-rt1015.m4 index ef9fb63e0174..981045d93f6b 100644 --- a/tools/topology/topology1/platform/intel/jsl-rt1015.m4 +++ b/tools/topology/topology1/platform/intel/jsl-rt1015.m4 @@ -12,7 +12,7 @@ define(`SPK_DATA_FORMAT', `s24le') define(`SET_SSP_CONFIG', `SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 1, 24))') diff --git a/tools/topology/topology1/platform/intel/jsl.m4 b/tools/topology/topology1/platform/intel/jsl.m4 index 00f19de73864..28752dc2de82 100644 --- a/tools/topology/topology1/platform/intel/jsl.m4 +++ b/tools/topology/topology1/platform/intel/jsl.m4 @@ -12,8 +12,8 @@ define(`SPK_DATA_FORMAT', `s16le') define(`SET_SSP_CONFIG', `SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 4800000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 4800000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(4, 25, 3, 240), SSP_CONFIG_DATA(SSP, SPK_INDEX, 16))' ) diff --git a/tools/topology/topology1/sof-acp-renoir.m4 b/tools/topology/topology1/sof-acp-renoir.m4 index 75c65c92d5e4..23dcdb57d5a2 100644 --- a/tools/topology/topology1/sof-acp-renoir.m4 +++ b/tools/topology/topology1/sof-acp-renoir.m4 @@ -31,8 +31,8 @@ PIPELINE_SOURCE_1, 2, s16le, 2000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) DAI_CONFIG(ACPSP, 0, 0, acp-headset-codec, ACPSP_CONFIG(I2S, ACP_CLOCK(mclk, 49152000, codec_mclk_in), - ACP_CLOCK(bclk, 3072000, codec_consumer), - ACP_CLOCK(fsync, 48000, codec_consumer), + ACP_CLOCK(bclk, 3072000, codec_slave), + ACP_CLOCK(fsync, 48000, codec_slave), ACP_TDM(2, 32, 3, 3),ACPSP_CONFIG_DATA(ACPSP, 0, 48000, 2))) # Capture pipeline 2 on PCM 0 using max 2 channels of s16le. diff --git a/tools/topology/topology1/sof-adl-nau8825.m4 b/tools/topology/topology1/sof-adl-nau8825.m4 index 8ae4f80c2b9c..14937c7fc408 100644 --- a/tools/topology/topology1/sof-adl-nau8825.m4 +++ b/tools/topology/topology1/sof-adl-nau8825.m4 @@ -322,7 +322,7 @@ PCM_CAPTURE_ADD(EchoRef, 6, PIPELINE_PCM_9)')') # dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) -dnl SSP_CLOCK(clock, freq, codec_provider, polarity) +dnl SSP_CLOCK(clock, freq, codec_master, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) dnl mclk_id is optional dnl ssp1-maxmspk @@ -330,8 +330,8 @@ dnl ssp1-maxmspk #SSP 0 (ID: 0) DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 0, 32, 0, 0, 0, SSP_CC_BCLK_ES))) @@ -350,8 +350,8 @@ ifdef(`SMART_AMP',,` `# SSP' SPK_SSP_INDEX `(ID: 7)' DAI_CONFIG(SSP, SPK_SSP_INDEX, SPK_BE_ID, SPK_SSP_NAME, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, SPK_SSP_INDEX, 16)))')') diff --git a/tools/topology/topology1/sof-apl-da7219.m4 b/tools/topology/topology1/sof-apl-da7219.m4 index 5ce3ea8f0802..9f23167d5a6c 100644 --- a/tools/topology/topology1/sof-apl-da7219.m4 +++ b/tools/topology/topology1/sof-apl-da7219.m4 @@ -160,16 +160,16 @@ PCM_PLAYBACK_ADD(HDMI3, 7, PIPELINE_PCM_7) #SSP 5 (ID: 0) with 19.2 MHz mclk with MCLK_ID 0 (unused), 1.536 MHz blck DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 5, 16, 0))) #SSP 1 (ID: 1) with 19.2 MHz mclk with MCLK_ID 0, 1.92 MHz bclk DAI_CONFIG(SSP, 1, 1, SSP1-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 1920000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1920000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 20, 3, 3), SSP_CONFIG_DATA(SSP, 1, 16, 0))) diff --git a/tools/topology/topology1/sof-apl-demux-pcm512x.m4 b/tools/topology/topology1/sof-apl-demux-pcm512x.m4 index ea33517d59e4..406bec97c9da 100644 --- a/tools/topology/topology1/sof-apl-demux-pcm512x.m4 +++ b/tools/topology/topology1/sof-apl-demux-pcm512x.m4 @@ -180,8 +180,8 @@ PCM_CAPTURE_ADD(EchoRef, 4, PIPELINE_PCM_5) #SSP 5 (ID: 0) DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) diff --git a/tools/topology/topology1/sof-apl-pcm512x.m4 b/tools/topology/topology1/sof-apl-pcm512x.m4 index b872b46e581b..baef388b0a11 100644 --- a/tools/topology/topology1/sof-apl-pcm512x.m4 +++ b/tools/topology/topology1/sof-apl-pcm512x.m4 @@ -179,8 +179,8 @@ ifdef(`CODEC_MASTER', ` DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, eval(FSYNC * 64), codec_provider), - SSP_CLOCK(fsync, FSYNC, codec_provider), + SSP_CLOCK(bclk, eval(FSYNC * 64), codec_master), + SSP_CLOCK(fsync, FSYNC, codec_master), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) ' @@ -188,8 +188,8 @@ DAI_CONFIG(SSP, 5, 0, SSP5-Codec, ` DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) ' diff --git a/tools/topology/topology1/sof-apl-rt298.m4 b/tools/topology/topology1/sof-apl-rt298.m4 index 63c6fa7e0fe8..4e1a596b8d90 100644 --- a/tools/topology/topology1/sof-apl-rt298.m4 +++ b/tools/topology/topology1/sof-apl-rt298.m4 @@ -110,8 +110,8 @@ PCM_PLAYBACK_ADD(HDMI3, 7, PIPELINE_PCM_7) # 3 HDMI/DP outputs (ID: 3,4,5) DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) diff --git a/tools/topology/topology1/sof-apl-tdf8532.m4 b/tools/topology/topology1/sof-apl-tdf8532.m4 index 78aa6ec0f2f7..99447c67efc0 100644 --- a/tools/topology/topology1/sof-apl-tdf8532.m4 +++ b/tools/topology/topology1/sof-apl-tdf8532.m4 @@ -197,43 +197,43 @@ PCM_DUPLEX_ADD(Port5, 5, PIPELINE_PCM_9, PIPELINE_PCM_10) # DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 0, 16))) DAI_CONFIG(SSP, 1, 1, SSP1-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 1, 16))) DAI_CONFIG(SSP, 2, 2, SSP2-Codec, SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 12288000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 12288000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(8, 32, 255, 255), SSP_CONFIG_DATA(SSP, 2, 32))) DAI_CONFIG(SSP, 3, 3, SSP3-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 3, 16))) DAI_CONFIG(SSP, 4, 4, SSP4-Codec, SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 12288000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 12288000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(8, 32, 15, 15), SSP_CONFIG_DATA(SSP, 4, 32))) DAI_CONFIG(SSP, 5, 5, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 5, 16))) diff --git a/tools/topology/topology1/sof-apl-wm8804.m4 b/tools/topology/topology1/sof-apl-wm8804.m4 index 86abd9f51d56..5ae7cf6b6454 100644 --- a/tools/topology/topology1/sof-apl-wm8804.m4 +++ b/tools/topology/topology1/sof-apl-wm8804.m4 @@ -75,7 +75,7 @@ PCM_DUPLEX_ADD(Port5, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) DAI_CONFIG(SSP, 5, 0, SSP5-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_provider), - SSP_CLOCK(fsync, 48000, codec_provider), + SSP_CLOCK(bclk, 3072000, codec_master), + SSP_CLOCK(fsync, 48000, codec_master), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) diff --git a/tools/topology/topology1/sof-bdw-codec.m4 b/tools/topology/topology1/sof-bdw-codec.m4 index 613975de2bb2..c014cce7f3df 100644 --- a/tools/topology/topology1/sof-bdw-codec.m4 +++ b/tools/topology/topology1/sof-bdw-codec.m4 @@ -91,8 +91,8 @@ PCM_DUPLEX_ADD(Low Latency, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # DAI_CONFIG(SSP, 0, 0, Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 24))) diff --git a/tools/topology/topology1/sof-bdw-nocodec.m4 b/tools/topology/topology1/sof-bdw-nocodec.m4 index 64db5dfbb60f..84dbe14a8de0 100644 --- a/tools/topology/topology1/sof-bdw-nocodec.m4 +++ b/tools/topology/topology1/sof-bdw-nocodec.m4 @@ -87,7 +87,7 @@ PCM_DUPLEX_ADD(Low Latency, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # DAI_CONFIG(SSP, 0, 0, NoCodec-0, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 24, 0, SSP_QUIRK_LBM))) diff --git a/tools/topology/topology1/sof-byt-codec.m4 b/tools/topology/topology1/sof-byt-codec.m4 index dc01d83840cd..2bdfe5a9e148 100644 --- a/tools/topology/topology1/sof-byt-codec.m4 +++ b/tools/topology/topology1/sof-byt-codec.m4 @@ -98,7 +98,7 @@ PCM_PLAYBACK_ADD(PCM Deep Buffer, 1, PIPELINE_PCM_4) # DAI_CONFIG(SSP, SSP_NUM, 0, SSP2-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP_NUM, 24))) diff --git a/tools/topology/topology1/sof-cavs-nocodec.m4 b/tools/topology/topology1/sof-cavs-nocodec.m4 index b034f56134e9..b07e3673518a 100644 --- a/tools/topology/topology1/sof-cavs-nocodec.m4 +++ b/tools/topology/topology1/sof-cavs-nocodec.m4 @@ -275,8 +275,8 @@ ifelse(ROOT_CLK, `19_2', ` DAI_CONFIG(SSP, SSP0_IDX, 0, NoCodec-0, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id, quirks, bclk_delay, dnl clks_control, pulse_width, padding) @@ -285,16 +285,16 @@ DAI_CONFIG(SSP, SSP0_IDX, 0, NoCodec-0, DAI_CONFIG(SSP, SSP1_IDX, 1, NoCodec-1, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, SSP1_IDX, 32, 0, SSP_QUIRK_LBM, 0, eval(SSP_CC_MCLK_ES | SSP_CC_BCLK_ES)))) DAI_CONFIG(SSP, SSP2_IDX, 2, NoCodec-2, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, SSP2_IDX, 32, 0, SSP_QUIRK_LBM, 0, eval(SSP_CC_MCLK_ES | SSP_CC_BCLK_ES)))) @@ -305,24 +305,24 @@ ifelse(ROOT_CLK, `24', DAI_CONFIG(SSP, SSP0_IDX, 0, NoCodec-0, dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 4800000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 4800000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP0_IDX, 24, 0, SSP_QUIRK_LBM, 0, eval(SSP_CC_MCLK_ES | SSP_CC_BCLK_ES)))) DAI_CONFIG(SSP, SSP1_IDX, 1, NoCodec-1, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 4800000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 4800000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP1_IDX, 24, 0, SSP_QUIRK_LBM, 0, eval(SSP_CC_MCLK_ES | SSP_CC_BCLK_ES)))) DAI_CONFIG(SSP, SSP2_IDX, 2, NoCodec-2, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 4800000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 4800000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP2_IDX, 24, 0, SSP_QUIRK_LBM, 0, eval(SSP_CC_MCLK_ES | SSP_CC_BCLK_ES)))) @@ -332,24 +332,24 @@ ifelse(ROOT_CLK, `38_4', ` DAI_CONFIG(SSP, SSP0_IDX, 0, NoCodec-0, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 38400000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP0_IDX, 24, 0, SSP_QUIRK_LBM, 0, eval(SSP_CC_MCLK_ES | SSP_CC_BCLK_ES)))) DAI_CONFIG(SSP, SSP1_IDX, 1, NoCodec-1, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 38400000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP1_IDX, 24, 0, SSP_QUIRK_LBM, 0, eval(SSP_CC_MCLK_ES | SSP_CC_BCLK_ES)))) DAI_CONFIG(SSP, SSP2_IDX, 2, NoCodec-2, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 38400000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP2_IDX, 24, 0, SSP_QUIRK_LBM, 0, eval(SSP_CC_MCLK_ES | SSP_CC_BCLK_ES)))) diff --git a/tools/topology/topology1/sof-cht-max98090.m4 b/tools/topology/topology1/sof-cht-max98090.m4 index f527546e328f..16fafe1c1093 100644 --- a/tools/topology/topology1/sof-cht-max98090.m4 +++ b/tools/topology/topology1/sof-cht-max98090.m4 @@ -98,8 +98,8 @@ PCM_PLAYBACK_ADD(PCM Deep Buffer, 1, PIPELINE_PCM_4) # DAI_CONFIG(SSP, SSP_NUM, 0, SSP2-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 1920000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1920000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 20, 3, 3), SSP_CONFIG_DATA(SSP, 2, 16))) diff --git a/tools/topology/topology1/sof-cht-nocodec.m4 b/tools/topology/topology1/sof-cht-nocodec.m4 index eeaf600632e5..03a44bd30d2b 100644 --- a/tools/topology/topology1/sof-cht-nocodec.m4 +++ b/tools/topology/topology1/sof-cht-nocodec.m4 @@ -98,7 +98,7 @@ PCM_PLAYBACK_ADD(PCM Deep Buffer, 1, PIPELINE_PCM_4) # DAI_CONFIG(SSP, SSP_NUM, SSP_NUM, NoCodec-2, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP_NUM, 24, 0, SSP_QUIRK_LBM))) diff --git a/tools/topology/topology1/sof-cml-demux-rt5682-max98357a.m4 b/tools/topology/topology1/sof-cml-demux-rt5682-max98357a.m4 index 49c370871ba2..c2733fbbcbad 100644 --- a/tools/topology/topology1/sof-cml-demux-rt5682-max98357a.m4 +++ b/tools/topology/topology1/sof-cml-demux-rt5682-max98357a.m4 @@ -54,7 +54,7 @@ PCM_PLAYBACK_ADD(Speakers, 6, PIPELINE_PCM_8) DAI_CONFIG(SSP, SSP1_INDEX, 6, SSP1_NAME, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP1_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, SSP1_BCLK, codec_consumer), - SSP_CLOCK(fsync, SSP1_FSYNC, codec_consumer), + SSP_CLOCK(bclk, SSP1_BCLK, codec_slave), + SSP_CLOCK(fsync, SSP1_FSYNC, codec_slave), SSP_TDM(2, SSP1_VALID_BITS, 3, 3), SSP_CONFIG_DATA(SSP, SSP1_INDEX, SSP1_VALID_BITS))) diff --git a/tools/topology/topology1/sof-cml-demux-rt5682.m4 b/tools/topology/topology1/sof-cml-demux-rt5682.m4 index 103667dd6196..ff131dfb75b5 100644 --- a/tools/topology/topology1/sof-cml-demux-rt5682.m4 +++ b/tools/topology/topology1/sof-cml-demux-rt5682.m4 @@ -205,8 +205,8 @@ PCM_CAPTURE_ADD(EchoRef, 5, PIPELINE_PCM_5) #SSP SSP_INDEX (ID: 0) DAI_CONFIG(SSP, SSP_INDEX, 0, SSP_NAME, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP_INDEX, 24))) diff --git a/tools/topology/topology1/sof-cml-rt1011-rt5682.m4 b/tools/topology/topology1/sof-cml-rt1011-rt5682.m4 index d6a1ab7ca256..20a69697da30 100644 --- a/tools/topology/topology1/sof-cml-rt1011-rt5682.m4 +++ b/tools/topology/topology1/sof-cml-rt1011-rt5682.m4 @@ -66,8 +66,8 @@ PCM_PLAYBACK_ADD(Speakers, 5, PIPELINE_PCM_7) DAI_CONFIG(SSP, SSP1_INDEX, 6, SSP1_NAME, SSP_CONFIG(DSP_A, SSP_CLOCK(mclk, SSP1_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, 4800000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 4800000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(4, 25, 3, 15), SSP_CONFIG_DATA(SET_SSP1_CONFIG_DATA))) diff --git a/tools/topology/topology1/sof-cml-rt5682-kwd.m4 b/tools/topology/topology1/sof-cml-rt5682-kwd.m4 index d77339607c01..f05ed9913ae4 100644 --- a/tools/topology/topology1/sof-cml-rt5682-kwd.m4 +++ b/tools/topology/topology1/sof-cml-rt5682-kwd.m4 @@ -207,8 +207,8 @@ SectionGraph."pipe-sof-cml-keyword-detect" { #SSP SSP_INDEX (ID: 0) DAI_CONFIG(SSP, SSP_INDEX, 0, SSP_NAME, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP_INDEX, 24))) diff --git a/tools/topology/topology1/sof-cml-rt5682-max98357a.m4 b/tools/topology/topology1/sof-cml-rt5682-max98357a.m4 index aac65e8fc7a6..1b8861ab4077 100644 --- a/tools/topology/topology1/sof-cml-rt5682-max98357a.m4 +++ b/tools/topology/topology1/sof-cml-rt5682-max98357a.m4 @@ -55,8 +55,8 @@ PCM_PLAYBACK_ADD(Speakers, 5, PIPELINE_PCM_7) DAI_CONFIG(SSP, SSP1_INDEX, 6, SSP1_NAME, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP1_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, SSP1_BCLK, codec_consumer), - SSP_CLOCK(fsync, SSP1_FSYNC, codec_consumer), + SSP_CLOCK(bclk, SSP1_BCLK, codec_slave), + SSP_CLOCK(fsync, SSP1_FSYNC, codec_slave), SSP_TDM(2, SSP1_VALID_BITS, 3, 3), SSP_CONFIG_DATA(SSP, SSP1_INDEX, SSP1_VALID_BITS))) diff --git a/tools/topology/topology1/sof-cml-rt5682.m4 b/tools/topology/topology1/sof-cml-rt5682.m4 index d3124a3b794b..ac928383ea08 100644 --- a/tools/topology/topology1/sof-cml-rt5682.m4 +++ b/tools/topology/topology1/sof-cml-rt5682.m4 @@ -184,8 +184,8 @@ PCM_CAPTURE_ADD(DMIC16kHz, 8, PIPELINE_PCM_8) #SSP SSP_INDEX (ID: 0) DAI_CONFIG(SSP, SSP_INDEX, 0, SSP_NAME, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP_INDEX, 24))) diff --git a/tools/topology/topology1/sof-cnl-rt274.m4 b/tools/topology/topology1/sof-cnl-rt274.m4 index 4fbc1957a259..6ea8cb35dd27 100644 --- a/tools/topology/topology1/sof-cnl-rt274.m4 +++ b/tools/topology/topology1/sof-cnl-rt274.m4 @@ -77,8 +77,8 @@ PCM_DUPLEX_ADD(Passthrough, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # DAI_CONFIG(SSP, 0, 1, SSP0-Codec, SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 4800000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 4800000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(4, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 24))) diff --git a/tools/topology/topology1/sof-ehl-rt5660.m4 b/tools/topology/topology1/sof-ehl-rt5660.m4 index fc9009b65470..132740bbb10f 100644 --- a/tools/topology/topology1/sof-ehl-rt5660.m4 +++ b/tools/topology/topology1/sof-ehl-rt5660.m4 @@ -189,8 +189,8 @@ PCM_PLAYBACK_ADD(HDMI4, 6, PIPELINE_PCM_8) #SSP 2 (ID: 0) DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 9600000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 24))) diff --git a/tools/topology/topology1/sof-glk-da7219-kwd.m4 b/tools/topology/topology1/sof-glk-da7219-kwd.m4 index 5b1a86d48504..b06d751e1d60 100644 --- a/tools/topology/topology1/sof-glk-da7219-kwd.m4 +++ b/tools/topology/topology1/sof-glk-da7219-kwd.m4 @@ -231,15 +231,15 @@ SectionGraph."pipe-sof-PLATFORM-keyword-detect" { DAI_CONFIG(SSP, 1, 0, SSP1-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, SSP1_BCLK, codec_consumer), - SSP_CLOCK(fsync, SSP_FSYNC, codec_consumer), + SSP_CLOCK(bclk, SSP1_BCLK, codec_slave), + SSP_CLOCK(fsync, SSP_FSYNC, codec_slave), SSP_TDM(2, SSP1_VALID_BITS, 3, 3), SSP_CONFIG_DATA(SSP, 1, SSP1_VALID_BITS, MCLK_ID))) DAI_CONFIG(SSP, SSP_INDEX, 1, SSP_NAME, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK_RATE, codec_mclk_in), - SSP_CLOCK(bclk, SSP_BCLK, codec_consumer), - SSP_CLOCK(fsync, SSP_FSYNC, codec_consumer), + SSP_CLOCK(bclk, SSP_BCLK, codec_slave), + SSP_CLOCK(fsync, SSP_FSYNC, codec_slave), SSP_TDM(2, SSP_BITS_WIDTH, 3, 3), SSP_CONFIG_DATA(SSP, SSP_INDEX, SSP_VALID_BITS, MCLK_ID))) diff --git a/tools/topology/topology1/sof-glk-da7219.m4 b/tools/topology/topology1/sof-glk-da7219.m4 index 96404af0e34c..c92982355101 100644 --- a/tools/topology/topology1/sof-glk-da7219.m4 +++ b/tools/topology/topology1/sof-glk-da7219.m4 @@ -181,8 +181,8 @@ PCM_PLAYBACK_ADD(HDMI3, 7, PIPELINE_PCM_7) #SSP 1 (ID: 0) with 19.2 MHz mclk with MCLK_ID 1 (unused), 1.536 MHz blck DAI_CONFIG(SSP, 1, 0, SSP1-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 1, 16, 1))) @@ -190,16 +190,16 @@ ifelse(HEADPHONE, `da7219', ` #SSP 2 (ID: 1) with 19.2 MHz mclk with MCLK_ID 1, 1.92 MHz bclk DAI_CONFIG(SSP, 2, 1, SSP2-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 1920000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1920000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 20, 3, 3), SSP_CONFIG_DATA(SSP, 2, 16, 1))) ', HEADPHONE, `cs42l42', ` #SSP 2 (ID: 1) with 19.2 MHz mclk with MCLK_ID 1 (unused), 2.4 MHz bclk, no quirk, 10 ms BCLK delay DAI_CONFIG(SSP, 2, 1, SSP2-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 2, 24, 1, 0, 0, SSP_CC_BCLK_ES))) ', ) diff --git a/tools/topology/topology1/sof-glk-es8336.m4 b/tools/topology/topology1/sof-glk-es8336.m4 index 2ff873f6b93d..13268d9faef8 100644 --- a/tools/topology/topology1/sof-glk-es8336.m4 +++ b/tools/topology/topology1/sof-glk-es8336.m4 @@ -158,8 +158,8 @@ PCM_PLAYBACK_ADD(HDMI 3, 7, PIPELINE_PCM_7) DAI_CONFIG(SSP, SSP_NUM, 0, `SSP'SSP_NUM`-Codec', SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP_NUM, 24, 1))) diff --git a/tools/topology/topology1/sof-glk-rt5682.m4 b/tools/topology/topology1/sof-glk-rt5682.m4 index 34bb09b666ea..a732c6f0a515 100644 --- a/tools/topology/topology1/sof-glk-rt5682.m4 +++ b/tools/topology/topology1/sof-glk-rt5682.m4 @@ -164,16 +164,16 @@ PCM_PLAYBACK_ADD(HDMI3, 7, PIPELINE_PCM_7) #SSP 1 (ID: 0) with 19.2 MHz mclk with MCLK_ID 1 (unused), 1.536 MHz blck DAI_CONFIG(SSP, 1, 0, SSP1-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 1, 16, 1))) #SSP 2 (ID: 1) with 19.2 MHz mclk with MCLK_ID 1, 2.4 MHz bclk DAI_CONFIG(SSP, 2, 1, SSP2-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 20, 3, 3), SSP_CONFIG_DATA(SSP, 2, 16, 1))) diff --git a/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 index 4c82c15eea1d..84b8a419b4bd 100644 --- a/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 @@ -124,8 +124,8 @@ COMPR_PLAYBACK_ADD(PCM Deep Buffer, 1, PIPELINE_PCM_4) # DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 16, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 b/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 index b3fcea341ab1..486235fa0ef6 100644 --- a/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 @@ -100,7 +100,7 @@ PCM_PLAYBACK_ADD(PCM Deep Buffer, 1, PIPELINE_PCM_4) # DAI_CONFIG(ESAI, 0, 0, esai0-cs42888, ESAI_CONFIG(I2S, ESAI_CLOCK(mclk, 49152000, codec_mclk_in), - ESAI_CLOCK(bclk, 3072000, codec_consumer), - ESAI_CLOCK(fsync, 48000, codec_consumer), + ESAI_CLOCK(bclk, 3072000, codec_slave), + ESAI_CLOCK(fsync, 48000, codec_slave), ESAI_TDM(2, 32, 3, 3), ESAI_CONFIG_DATA(ESAI, 0, 0))) diff --git a/tools/topology/topology1/sof-imx8-cs42888.m4 b/tools/topology/topology1/sof-imx8-cs42888.m4 index 49d4de3324fb..b7e00b57007e 100644 --- a/tools/topology/topology1/sof-imx8-cs42888.m4 +++ b/tools/topology/topology1/sof-imx8-cs42888.m4 @@ -76,7 +76,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) dnl DAI_CONFIG(type, idx, link_id, name, esai_config) DAI_CONFIG(ESAI, 0, 0, esai0-cs42888, ESAI_CONFIG(I2S, ESAI_CLOCK(mclk, 49152000, codec_mclk_in), - ESAI_CLOCK(bclk, 3072000, codec_consumer), - ESAI_CLOCK(fsync, 48000, codec_consumer), + ESAI_CLOCK(bclk, 3072000, codec_slave), + ESAI_CLOCK(fsync, 48000, codec_slave), ESAI_TDM(2, 32, 3, 3), ESAI_CONFIG_DATA(ESAI, 0, 0))) diff --git a/tools/topology/topology1/sof-imx8-nocodec-sai.m4 b/tools/topology/topology1/sof-imx8-nocodec-sai.m4 index b77fe0537975..4c130f075146 100644 --- a/tools/topology/topology1/sof-imx8-nocodec-sai.m4 +++ b/tools/topology/topology1/sof-imx8-nocodec-sai.m4 @@ -62,7 +62,7 @@ PCM_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1) dnl DAI_CONFIG(type, dai_index, link_id, name, sai_config) DAI_CONFIG(SAI, 1, 0, NoCodec-0, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 49152000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_consumer), - SAI_CLOCK(fsync, 48000, codec_consumer), + SAI_CLOCK(bclk, 3072000, codec_slave), + SAI_CLOCK(fsync, 48000, codec_slave), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/sof-imx8-nocodec.m4 b/tools/topology/topology1/sof-imx8-nocodec.m4 index aa33e86d0f38..dadd916c7599 100644 --- a/tools/topology/topology1/sof-imx8-nocodec.m4 +++ b/tools/topology/topology1/sof-imx8-nocodec.m4 @@ -62,7 +62,7 @@ PCM_PLAYBACK_ADD(Port0, 0, PIPELINE_PCM_1) dnl DAI_CONFIG(type, dai_index, link_id, name, esai_config) DAI_CONFIG(ESAI, 0, 0, NoCodec-0, ESAI_CONFIG(I2S, ESAI_CLOCK(mclk, 49152000, codec_mclk_in), - ESAI_CLOCK(bclk, 3072000, codec_consumer), - ESAI_CLOCK(fsync, 48000, codec_consumer), + ESAI_CLOCK(bclk, 3072000, codec_slave), + ESAI_CLOCK(fsync, 48000, codec_slave), ESAI_TDM(2, 32, 3, 3), ESAI_CONFIG_DATA(ESAI, 0, 0))) diff --git a/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 b/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 index 44e2ecf8e83b..54b8157a44a9 100644 --- a/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 @@ -84,7 +84,7 @@ SectionGraph."pipe-sof-imx8-keyword-detect" { dnl DAI_CONFIG(type, dai_index, link_id, name, sai_config) DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 16000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 16000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 index 409c0ffa7c5a..8e5e52a30f78 100644 --- a/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 @@ -100,7 +100,7 @@ PCM_PLAYBACK_ADD(PCM Deep Buffer, 1, PIPELINE_PCM_4) # DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 16, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/sof-imx8-wm8960.m4 b/tools/topology/topology1/sof-imx8-wm8960.m4 index ea9903f67f9c..65659bac4afd 100644 --- a/tools/topology/topology1/sof-imx8-wm8960.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960.m4 @@ -76,7 +76,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) dnl DAI_CONFIG(type, idx, link_id, name, sai_config) DAI_CONFIG(SAI, 1, 0, sai1-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 index 67ef6bb0cfa9..799019ea3acb 100644 --- a/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 @@ -122,7 +122,7 @@ COMPR_PLAYBACK_ADD(PCM Deep Buffer, 1, PIPELINE_PCM_4) # DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 16, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 b/tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 index 61bb1ce513b0..9f03a58ac72d 100644 --- a/tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 +++ b/tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 @@ -90,7 +90,7 @@ SectionGraph."pipe-sof-apl-keyword-detect" { dnl DAI_CONFIG(type, dai_index, link_id, name, sai_config/ssp_config/dmic_config) DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 16000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 16000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 index 24dbdd771648..6aa2a44ef579 100644 --- a/tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 @@ -100,7 +100,7 @@ PCM_PLAYBACK_ADD(PCM Deep Buffer, 1, PIPELINE_PCM_4) # DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 16, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/sof-imx8mp-wm8960.m4 b/tools/topology/topology1/sof-imx8mp-wm8960.m4 index b77c3be532cc..9acc5baf34ff 100644 --- a/tools/topology/topology1/sof-imx8mp-wm8960.m4 +++ b/tools/topology/topology1/sof-imx8mp-wm8960.m4 @@ -76,7 +76,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) dnl DAI_CONFIG(type, idx, link_id, name, sai_config) DAI_CONFIG(SAI, 3, 0, sai3-wm8960-hifi, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_provider), - SAI_CLOCK(fsync, 48000, codec_provider), + SAI_CLOCK(bclk, 3072000, codec_master), + SAI_CLOCK(fsync, 48000, codec_master), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/sof-imx8ulp-btsco.m4 b/tools/topology/topology1/sof-imx8ulp-btsco.m4 index b57df13a0684..f542e91b9f27 100644 --- a/tools/topology/topology1/sof-imx8ulp-btsco.m4 +++ b/tools/topology/topology1/sof-imx8ulp-btsco.m4 @@ -79,7 +79,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) dnl DAI_CONFIG(type, idx, link_id, name, sai_config) DAI_CONFIG(SAI, 5, 0, sai5-bt-sco-pcm-wb, SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_out), - SAI_CLOCK(bclk, 256000, codec_consumer), - SAI_CLOCK(fsync, 8000, codec_consumer), + SAI_CLOCK(bclk, 256000, codec_slave), + SAI_CLOCK(fsync, 8000, codec_slave), SAI_TDM(1, 16, 1, 1), SAI_CONFIG_DATA(SAI, 5, 0))) diff --git a/tools/topology/topology1/sof-jsl-da7219.m4 b/tools/topology/topology1/sof-jsl-da7219.m4 index 418eb5f4ea6e..4ec553651165 100644 --- a/tools/topology/topology1/sof-jsl-da7219.m4 +++ b/tools/topology/topology1/sof-jsl-da7219.m4 @@ -159,7 +159,7 @@ PCM_PLAYBACK_ADD(HDMI3, 4, PIPELINE_PCM_7) dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) -dnl SSP_CLOCK(clock, freq, codec_provider, polarity) +dnl SSP_CLOCK(clock, freq, codec_master, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) dnl mclk_id is optional @@ -170,8 +170,8 @@ DAI_CONFIG(SSP, SPK_INDEX, 0, SPK_NAME, # SSP 0 (ID: 1) DAI_CONFIG(SSP, 0, 1, SSP0-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 16))) diff --git a/tools/topology/topology1/sof-jsl-rt5682.m4 b/tools/topology/topology1/sof-jsl-rt5682.m4 index c4b4a125a258..89fb7045f344 100644 --- a/tools/topology/topology1/sof-jsl-rt5682.m4 +++ b/tools/topology/topology1/sof-jsl-rt5682.m4 @@ -169,14 +169,14 @@ PCM_PLAYBACK_ADD(HDMI3, 4, PIPELINE_PCM_7) # dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) -dnl SSP_CLOCK(clock, freq, codec_provider, polarity) +dnl SSP_CLOCK(clock, freq, codec_master, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) # SSP 0 (ID: 0) ALC5682 DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 24, 0, 0, 0, SSP_CC_BCLK_ES))) diff --git a/tools/topology/topology1/sof-rn-rt5682-max98360.m4 b/tools/topology/topology1/sof-rn-rt5682-max98360.m4 index 4aa142d40418..fce02a79e00e 100644 --- a/tools/topology/topology1/sof-rn-rt5682-max98360.m4 +++ b/tools/topology/topology1/sof-rn-rt5682-max98360.m4 @@ -33,8 +33,8 @@ DAI_ADD(sof/pipe-dai-playback.m4, DAI_CONFIG(ACPSP, 0, 0, acp-headset-codec, ACPSP_CONFIG(I2S, ACP_CLOCK(mclk, 49152000, codec_mclk_in), - ACP_CLOCK(bclk, 3072000, codec_consumer), - ACP_CLOCK(fsync, 48000, codec_consumer), + ACP_CLOCK(bclk, 3072000, codec_slave), + ACP_CLOCK(fsync, 48000, codec_slave), ACP_TDM(2, 32, 3, 3), ACPSP_CONFIG_DATA(ACPSP, 0, 48000, 2))) diff --git a/tools/topology/topology1/sof-rn-rt5682-rt1019.m4 b/tools/topology/topology1/sof-rn-rt5682-rt1019.m4 index 4aa142d40418..fce02a79e00e 100644 --- a/tools/topology/topology1/sof-rn-rt5682-rt1019.m4 +++ b/tools/topology/topology1/sof-rn-rt5682-rt1019.m4 @@ -33,8 +33,8 @@ DAI_ADD(sof/pipe-dai-playback.m4, DAI_CONFIG(ACPSP, 0, 0, acp-headset-codec, ACPSP_CONFIG(I2S, ACP_CLOCK(mclk, 49152000, codec_mclk_in), - ACP_CLOCK(bclk, 3072000, codec_consumer), - ACP_CLOCK(fsync, 48000, codec_consumer), + ACP_CLOCK(bclk, 3072000, codec_slave), + ACP_CLOCK(fsync, 48000, codec_slave), ACP_TDM(2, 32, 3, 3), ACPSP_CONFIG_DATA(ACPSP, 0, 48000, 2))) diff --git a/tools/topology/topology1/sof-smart-amplifier.m4 b/tools/topology/topology1/sof-smart-amplifier.m4 index d0442ec8430d..b96f7f163480 100644 --- a/tools/topology/topology1/sof-smart-amplifier.m4 +++ b/tools/topology/topology1/sof-smart-amplifier.m4 @@ -230,8 +230,8 @@ DAI_CONFIG(ALH, eval(SMART_ALH_INDEX + 1), eval(SMART_BE_ID + 1), SMART_ALH_CAPT #SSP SSP_INDEX (ID: SMART_BE_ID) DAI_CONFIG(SSP, SMART_SSP_INDEX, SMART_BE_ID, SMART_SSP_NAME, SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, SSP_MCLK, codec_mclk_in), - SSP_CLOCK(bclk, 12288000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 12288000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(8, 32, 15, 255), SSP_CONFIG_DATA(SSP, SMART_SSP_INDEX, 32, 0, SMART_SSP_QUIRK))) ') diff --git a/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 b/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 index f770c0fc5f14..8fdfae9771b1 100644 --- a/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 +++ b/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 @@ -352,7 +352,7 @@ ifdef(`2CH_2WAY',`# No echo reference for 2-way speakers', # dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) -dnl SSP_CLOCK(clock, freq, codec_provider, polarity) +dnl SSP_CLOCK(clock, freq, codec_master, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) dnl mclk_id is optional dnl ssp1-maxmspk @@ -363,32 +363,32 @@ DAI_CONFIG(SSP, SPK_SSP_INDEX, SPK_BE_ID, SPK_SSP_NAME, ifelse( CODEC, `MAX98357A', ` SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 1536000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 1536000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, SPK_SSP_INDEX, 16)))', CODEC, `MAX98360A', ` SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, SPK_SSP_INDEX, 32)))', CODEC, `MAX98360A_TDM', ` SSP_CONFIG(DSP_A, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 12288000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 12288000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(8, 32, 15, 15), SSP_CONFIG_DATA(SSP, SPK_SSP_INDEX, 32)))', CODEC, `RT1011', ` SSP_CONFIG(DSP_A, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 4800000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 4800000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(4, 25, 3, 15), SSP_CONFIG_DATA(SSP, SPK_SSP_INDEX, 24)))', CODEC, `MAX98390', ` SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 6144000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 6144000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(4, 32, 3, 15), SSP_CONFIG_DATA(SSP, SPK_SSP_INDEX, 32)))', )') @@ -396,8 +396,8 @@ ifelse( # SSP 0 (ID: 0) DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 2400000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 24, 0, 0, 0, SSP_CC_BCLK_ES))) diff --git a/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 b/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 index 6627b945252e..7e59721f19d8 100644 --- a/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 +++ b/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 @@ -221,7 +221,7 @@ PCM_PLAYBACK_ADD(HDMI4, 5, PIPELINE_PCM_8) # dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config) dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) -dnl SSP_CLOCK(clock, freq, codec_provider, polarity) +dnl SSP_CLOCK(clock, freq, codec_master, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) dnl mclk_id is optional dnl ssp1-maxmspk, ssp0-RTHeadset @@ -229,8 +229,8 @@ dnl ssp1-maxmspk, ssp0-RTHeadset #SSP 0 (ID: 0) DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, SSP_MCLK, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_consumer), - SSP_CLOCK(fsync, 48000, codec_consumer), + SSP_CLOCK(bclk, 3072000, codec_slave), + SSP_CLOCK(fsync, 48000, codec_slave), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 0, 32)))