From aef364db38b4bc96e1b02ad8b25b59eb9ade1293 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Fri, 23 Sep 2022 09:21:11 +0300 Subject: [PATCH 1/2] Tools: Topology: Change codec_slave to codec_consumer This patch avoids warnings print for: ALSA lib pcm.c:1471:(tplg_parse_hw_config) deprecated bclk value 'codec_slave', use 'codec_consumer' ALSA lib pcm.c:1523:(tplg_parse_hw_config) deprecated fsync value 'codec_slave', use 'codec_consumer'" Signed-off-by: Seppo Ingalsuo --- .../development/sof-apl-asrc-pcm512x.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 +-- .../development/sof-apl-src-pcm512x.m4 | 4 +-- .../sof-cml-rt1011-rt5682-nokwd.m4 | 8 ++--- .../development/sof-cml-src-rt5682.m4 | 4 +-- .../development/sof-imx8-src-cs42888.m4 | 4 +-- .../development/sof-tgl-nocodec-ci.m4 | 8 ++--- .../platform/intel/intel-generic-bt.m4 | 4 +-- .../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-acp-rmb.m4 | 4 +-- tools/topology/topology1/sof-adl-nau8825.m4 | 8 ++--- tools/topology/topology1/sof-apl-da7219.m4 | 8 ++--- .../topology1/sof-apl-demux-pcm512x.m4 | 4 +-- tools/topology/topology1/sof-apl-pcm512x.m4 | 4 +-- tools/topology/topology1/sof-apl-rt298.m4 | 4 +-- tools/topology/topology1/sof-apl-tdf8532.m4 | 24 ++++++------- 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 +-- .../sof-eq-iir-dts-codec-smart-amplifier.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-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 +-- tools/topology/topology1/sof-imx8ulp-btsco.m4 | 4 +-- tools/topology/topology1/sof-jsl-da7219.m4 | 4 +-- tools/topology/topology1/sof-jsl-rt5682.m4 | 4 +-- .../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 | 32 ++++++++--------- .../topology1/sof-tgl-max98373-rt5682.m4 | 4 +-- 54 files changed, 174 insertions(+), 174 deletions(-) diff --git a/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 b/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 index 55ded863956b..5dd8193af54e 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 b8d063fea9d2..e41a0c45d981 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), -# SSP_CLOCK(fsync, 48000, codec_slave), +# SSP_CLOCK(bclk, 1536000, codec_consumer), +# SSP_CLOCK(fsync, 48000, codec_consumer), # 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), -# SSP_CLOCK(fsync, 48000, codec_slave), +# SSP_CLOCK(bclk, 1536000, codec_consumer), +# SSP_CLOCK(fsync, 48000, codec_consumer), # 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 f3d796e9916c..a3cde5d643dd 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 6144000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 9479b1a4bf47..08b6393297f9 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 6144000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 4e3814745ac6..a3ccc68e1d70 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 4833bca55f30..8a4ad74b66ba 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_slave), - SSP_CLOCK(fsync, 50000, codec_slave), + SSP_CLOCK(bclk, 3200000, codec_consumer), + SSP_CLOCK(fsync, 50000, codec_consumer), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) diff --git a/tools/topology/topology1/development/sof-apl-src-pcm512x.m4 b/tools/topology/topology1/development/sof-apl-src-pcm512x.m4 index 8f3ae16e7d8a..44e1aaf22da0 100644 --- a/tools/topology/topology1/development/sof-apl-src-pcm512x.m4 +++ b/tools/topology/topology1/development/sof-apl-src-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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 16aaf5b82923..542645f0fc7f 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 4800000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 6358e7582bb3..b24b744882c4 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 1, 24))) diff --git a/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 b/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 index 3de6e81267cd..ddc16a80d632 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_slave), - ESAI_CLOCK(fsync, 48000, codec_slave), + ESAI_CLOCK(bclk, 3072000, codec_consumer), + ESAI_CLOCK(fsync, 48000, codec_consumer), ESAI_TDM(2, 32, 3, 3), ESAI_CONFIG_DATA(ESAI, 0, 0))) diff --git a/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 b/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 index c53242f9a73d..7eb918574c89 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 1, 24, 0, SSP_QUIRK_LBM))) diff --git a/tools/topology/topology1/platform/intel/intel-generic-bt.m4 b/tools/topology/topology1/platform/intel/intel-generic-bt.m4 index 48c9456da71b..7ad4b3a61081 100644 --- a/tools/topology/topology1/platform/intel/intel-generic-bt.m4 +++ b/tools/topology/topology1/platform/intel/intel-generic-bt.m4 @@ -72,8 +72,8 @@ define(`ssp_config_list_1', LIST(`', `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_slave),' - `SSP_CLOCK(fsync, 48000, codec_slave),' + `SSP_CLOCK(bclk, 1536000, codec_consumer),' + `SSP_CLOCK(fsync, 48000, codec_consumer),' `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 137d805e6836..112029ba7f5d 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2304000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 981045d93f6b..ef9fb63e0174 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 28752dc2de82..00f19de73864 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 4800000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 46b5a95f6c13..6da2cc98101d 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_slave), - ACP_CLOCK(fsync, 48000, codec_slave), + ACP_CLOCK(bclk, 3072000, codec_consumer), + ACP_CLOCK(fsync, 48000, codec_consumer), 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-acp-rmb.m4 b/tools/topology/topology1/sof-acp-rmb.m4 index e70dd77c95fa..04bb43a73916 100644 --- a/tools/topology/topology1/sof-acp-rmb.m4 +++ b/tools/topology/topology1/sof-acp-rmb.m4 @@ -31,8 +31,8 @@ PIPELINE_SOURCE_1, 2, s16le, 2000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) DAI_CONFIG(ACPHS, 0, 0, acp-headset-codec, ACPHS_CONFIG(I2S, ACP_CLOCK(mclk, 49152000, codec_mclk_in), - ACP_CLOCK(bclk, 3072000, codec_slave), - ACP_CLOCK(fsync, 48000, codec_slave), + ACP_CLOCK(bclk, 3072000, codec_consumer), + ACP_CLOCK(fsync, 48000, codec_consumer), ACP_TDM(2, 32, 3, 3),ACPHS_CONFIG_DATA(ACPHS, 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 8187597bc7eb..318b7dcb2b27 100644 --- a/tools/topology/topology1/sof-adl-nau8825.m4 +++ b/tools/topology/topology1/sof-adl-nau8825.m4 @@ -338,8 +338,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 0, 32, 0, 0, 0, SSP_CC_BCLK_ES))) @@ -358,8 +358,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 d0405edf740d..08a45e8947b1 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1920000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 457137a4c01d..7b1a921316a9 100644 --- a/tools/topology/topology1/sof-apl-demux-pcm512x.m4 +++ b/tools/topology/topology1/sof-apl-demux-pcm512x.m4 @@ -184,8 +184,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 de10231f3bb0..f5915afe0819 100644 --- a/tools/topology/topology1/sof-apl-pcm512x.m4 +++ b/tools/topology/topology1/sof-apl-pcm512x.m4 @@ -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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 4e1a596b8d90..63c6fa7e0fe8 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 99447c67efc0..78aa6ec0f2f7 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 12288000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 12288000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 16, 3, 3), SSP_CONFIG_DATA(SSP, 5, 16))) diff --git a/tools/topology/topology1/sof-bdw-codec.m4 b/tools/topology/topology1/sof-bdw-codec.m4 index c014cce7f3df..613975de2bb2 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 84dbe14a8de0..64db5dfbb60f 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 2bdfe5a9e148..dc01d83840cd 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 1efa0dddf109..af80ed66dff1 100644 --- a/tools/topology/topology1/sof-cavs-nocodec.m4 +++ b/tools/topology/topology1/sof-cavs-nocodec.m4 @@ -279,8 +279,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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) @@ -289,16 +289,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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)))) @@ -309,24 +309,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 4800000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 4800000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 4800000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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)))) @@ -336,24 +336,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 16fafe1c1093..f527546e328f 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1920000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 03a44bd30d2b..eeaf600632e5 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 c2733fbbcbad..49c370871ba2 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_slave), - SSP_CLOCK(fsync, SSP1_FSYNC, codec_slave), + SSP_CLOCK(bclk, SSP1_BCLK, codec_consumer), + SSP_CLOCK(fsync, SSP1_FSYNC, codec_consumer), 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 ff131dfb75b5..103667dd6196 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 20a69697da30..d6a1ab7ca256 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 4800000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 f05ed9913ae4..d77339607c01 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 1b8861ab4077..aac65e8fc7a6 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_slave), - SSP_CLOCK(fsync, SSP1_FSYNC, codec_slave), + SSP_CLOCK(bclk, SSP1_BCLK, codec_consumer), + SSP_CLOCK(fsync, SSP1_FSYNC, codec_consumer), 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 ac928383ea08..d3124a3b794b 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 6ea8cb35dd27..4fbc1957a259 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 4800000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 132740bbb10f..fc9009b65470 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 24))) diff --git a/tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 b/tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 index 5fac391444fc..eb7ec9344ccc 100644 --- a/tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 +++ b/tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 @@ -222,8 +222,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 12288000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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-glk-da7219-kwd.m4 b/tools/topology/topology1/sof-glk-da7219-kwd.m4 index b06d751e1d60..5b1a86d48504 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_slave), - SSP_CLOCK(fsync, SSP_FSYNC, codec_slave), + SSP_CLOCK(bclk, SSP1_BCLK, codec_consumer), + SSP_CLOCK(fsync, SSP_FSYNC, codec_consumer), 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_slave), - SSP_CLOCK(fsync, SSP_FSYNC, codec_slave), + SSP_CLOCK(bclk, SSP_BCLK, codec_consumer), + SSP_CLOCK(fsync, SSP_FSYNC, codec_consumer), 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 c92982355101..96404af0e34c 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1920000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 08fc45124ca5..27f510d6b8e6 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, SSP_NUM, 24, 0))) diff --git a/tools/topology/topology1/sof-glk-rt5682.m4 b/tools/topology/topology1/sof-glk-rt5682.m4 index a732c6f0a515..34bb09b666ea 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 20, 3, 3), SSP_CONFIG_DATA(SSP, 2, 16, 1))) diff --git a/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 b/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 index 486235fa0ef6..b3fcea341ab1 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_slave), - ESAI_CLOCK(fsync, 48000, codec_slave), + ESAI_CLOCK(bclk, 3072000, codec_consumer), + ESAI_CLOCK(fsync, 48000, codec_consumer), 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 b7e00b57007e..49d4de3324fb 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_slave), - ESAI_CLOCK(fsync, 48000, codec_slave), + ESAI_CLOCK(bclk, 3072000, codec_consumer), + ESAI_CLOCK(fsync, 48000, codec_consumer), 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 4c130f075146..b77fe0537975 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_slave), - SAI_CLOCK(fsync, 48000, codec_slave), + SAI_CLOCK(bclk, 3072000, codec_consumer), + SAI_CLOCK(fsync, 48000, codec_consumer), 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 dadd916c7599..aa33e86d0f38 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_slave), - ESAI_CLOCK(fsync, 48000, codec_slave), + ESAI_CLOCK(bclk, 3072000, codec_consumer), + ESAI_CLOCK(fsync, 48000, codec_consumer), ESAI_TDM(2, 32, 3, 3), ESAI_CONFIG_DATA(ESAI, 0, 0))) diff --git a/tools/topology/topology1/sof-imx8ulp-btsco.m4 b/tools/topology/topology1/sof-imx8ulp-btsco.m4 index f542e91b9f27..b57df13a0684 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_slave), - SAI_CLOCK(fsync, 8000, codec_slave), + SAI_CLOCK(bclk, 256000, codec_consumer), + SAI_CLOCK(fsync, 8000, codec_consumer), 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 4ec553651165..36980f7850f5 100644 --- a/tools/topology/topology1/sof-jsl-da7219.m4 +++ b/tools/topology/topology1/sof-jsl-da7219.m4 @@ -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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 70fb1fd44ae9..06a64d70e20d 100644 --- a/tools/topology/topology1/sof-jsl-rt5682.m4 +++ b/tools/topology/topology1/sof-jsl-rt5682.m4 @@ -175,8 +175,8 @@ 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 25, 3, 3), SSP_CONFIG_DATA(SSP, 0, 24, 0, 0, 0, eval(SSP_CC_BCLK_ES | SSP_CC_MCLK_AON)))) diff --git a/tools/topology/topology1/sof-rn-rt5682-max98360.m4 b/tools/topology/topology1/sof-rn-rt5682-max98360.m4 index 4b379aaa51cf..4430af854bc5 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_slave), - ACP_CLOCK(fsync, 48000, codec_slave), + ACP_CLOCK(bclk, 3072000, codec_consumer), + ACP_CLOCK(fsync, 48000, codec_consumer), 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 039572c084f6..29bf4cb7acc1 100644 --- a/tools/topology/topology1/sof-rn-rt5682-rt1019.m4 +++ b/tools/topology/topology1/sof-rn-rt5682-rt1019.m4 @@ -34,8 +34,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_slave), - ACP_CLOCK(fsync, 48000, codec_slave), + ACP_CLOCK(bclk, 3072000, codec_consumer), + ACP_CLOCK(fsync, 48000, codec_consumer), 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 d839d14a8746..4e4e5ddc26e8 100644 --- a/tools/topology/topology1/sof-smart-amplifier.m4 +++ b/tools/topology/topology1/sof-smart-amplifier.m4 @@ -238,8 +238,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 12288000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 4ca82db58c78..fd7686f262a0 100644 --- a/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 +++ b/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 @@ -417,44 +417,44 @@ 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 1536000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 12288000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 4800000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 6144000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(4, 32, 3, 15), SSP_CONFIG_DATA(SSP, SPK_SSP_INDEX, 32)))', CODEC, `RT1019', ` SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 3072000, codec_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, SPK_SSP_INDEX, 24)))', CODEC, `CS35L41', ` SSP_CONFIG(DSP_A, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 6144000, codec_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 6144000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(4, 32, 3, 15), SSP_CONFIG_DATA(SSP, SPK_SSP_INDEX, 24)))', )') @@ -463,8 +463,8 @@ ifdef(`NO_HEADPHONE',`',` # SSP 0 (ID: BOARD_HP_BE_ID) DAI_CONFIG(SSP, 0, BOARD_HP_BE_ID, SSP0-Codec, SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in), - SSP_CLOCK(bclk, 2400000, codec_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 2400000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), 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 7c71cc44a309..b9d650480f6b 100644 --- a/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 +++ b/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 @@ -235,8 +235,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_slave), - SSP_CLOCK(fsync, 48000, codec_slave), + SSP_CLOCK(bclk, 3072000, codec_consumer), + SSP_CLOCK(fsync, 48000, codec_consumer), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 0, 32))) From 9a7aca221a9d64bfc3b1d1fd441ebb0f16af521b Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Fri, 23 Sep 2022 09:28:55 +0300 Subject: [PATCH 2/2] Tools: Topology: Change occurrences of codec_master to codec_provider This patch avoids print of warning: ALSA lib pcm.c:1477:(tplg_parse_hw_config) deprecated bclk value 'codec_master', use 'codec_provider ALSA lib pcm.c:1529:(tplg_parse_hw_config) deprecated fsync value 'codec_master', use 'codec_provider' Signed-off-by: Seppo Ingalsuo --- .../topology/topology1/development/sof-apl-asrc-wm8804.m4 | 4 ++-- .../topology1/development/sof-imx8-compr-aac-wm8960.m4 | 4 ++-- .../topology1/development/sof-imx8-compr-mp3-wm8960.m4 | 4 ++-- .../development/sof-imx8-compr-pcm-cap-wm8960.m4 | 4 ++-- .../topology1/development/sof-imx8-compr-pcm-wm8960.m4 | 4 ++-- .../topology/topology1/development/sof-imx8-src-wm8960.m4 | 4 ++-- .../topology1/development/sof-imx8mp-compr-aac-wm8960.m4 | 4 ++-- .../topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 | 4 ++-- .../development/sof-imx8mp-compr-pcm-cap-wm8960.m4 | 4 ++-- .../topology1/development/sof-imx8mp-compr-pcm-wm8960.m4 | 4 ++-- .../topology1/development/sof-imx8mp-src-wm8960.m4 | 4 ++-- tools/topology/topology1/platform/common/acp-hs.m4 | 2 +- tools/topology/topology1/platform/common/acp-sp.m4 | 2 +- tools/topology/topology1/platform/common/esai.m4 | 2 +- tools/topology/topology1/platform/common/sai.m4 | 2 +- tools/topology/topology1/platform/common/ssp.m4 | 2 +- .../topology/topology1/platform/intel/intel-generic-bt.m4 | 8 ++++---- tools/topology/topology1/sof-adl-nau8825.m4 | 2 +- tools/topology/topology1/sof-apl-pcm512x.m4 | 4 ++-- tools/topology/topology1/sof-apl-wm8804.m4 | 4 ++-- tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 | 4 ++-- tools/topology/topology1/sof-imx8-wm8960-kwd.m4 | 4 ++-- tools/topology/topology1/sof-imx8-wm8960-mixer.m4 | 4 ++-- tools/topology/topology1/sof-imx8-wm8960.m4 | 4 ++-- tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 | 4 ++-- tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 | 4 ++-- tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 | 4 ++-- tools/topology/topology1/sof-imx8mp-wm8960.m4 | 4 ++-- tools/topology/topology1/sof-jsl-da7219.m4 | 2 +- tools/topology/topology1/sof-jsl-rt5682.m4 | 2 +- tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 | 2 +- tools/topology/topology1/sof-tgl-max98373-rt5682.m4 | 2 +- 32 files changed, 56 insertions(+), 56 deletions(-) diff --git a/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 b/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 index 8ed5e009e88b..c596d651c37f 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_master), - SSP_CLOCK(fsync, 48000, codec_master), + SSP_CLOCK(bclk, 3072000, codec_provider), + SSP_CLOCK(fsync, 48000, codec_provider), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 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 a11ba177962d..4e5db8897eb4 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), 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 ab9f31bcd427..1c7059d24ef5 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 index a302219bc992..3a704b16401a 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 @@ -84,7 +84,7 @@ COMPR_CAPTURE_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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 index eefc83250fc6..69c98a92c4d5 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 @@ -84,7 +84,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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 index c2d578c3ff09..57fc340e0ec6 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), 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 8b0f0dc59b36..4a477462fccd 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), 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 d18970b1a295..576f757eb7b6 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-pcm-cap-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-compr-pcm-cap-wm8960.m4 index 23e503657992..e9ab48d7b5d8 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-pcm-cap-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-pcm-cap-wm8960.m4 @@ -85,7 +85,7 @@ COMPR_CAPTURE_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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4 index 625b29bec90f..c376c0327fc7 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4 @@ -85,7 +85,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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), 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 454b3329df74..010d5f7755d4 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/platform/common/acp-hs.m4 b/tools/topology/topology1/platform/common/acp-hs.m4 index e4b088915b6b..bf2c687d899d 100644 --- a/tools/topology/topology1/platform/common/acp-hs.m4 +++ b/tools/topology/topology1/platform/common/acp-hs.m4 @@ -2,7 +2,7 @@ divert(-1) dnl ACPHS related macros -dnl ACP_CLOCK(clock, freq, codec_master, polarity) +dnl ACP_CLOCK(clock, freq, codec_provider, polarity) dnl polarity is optional define(`ACP_CLOCK', $1 STR($3) diff --git a/tools/topology/topology1/platform/common/acp-sp.m4 b/tools/topology/topology1/platform/common/acp-sp.m4 index 3d57240a248c..c171a354576b 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_master, polarity) +dnl ACP_CLOCK(clock, freq, codec_provider, 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 9dd1b4c845cd..7b44caf5d8fb 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_master, polarity) +dnl ESAI_CLOCK(clock, freq, codec_provider, 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 9697aa374bd6..5acbb714a553 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_master, polarity) +dnl SAI_CLOCK(clock, freq, codec_provider, 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 9dbedcf643f6..d3f5b19afad3 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_master, polarity) +dnl SSP_CLOCK(clock, freq, codec_provider, 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 7ad4b3a61081..5616a5641b8a 100644 --- a/tools/topology/topology1/platform/intel/intel-generic-bt.m4 +++ b/tools/topology/topology1/platform/intel/intel-generic-bt.m4 @@ -62,13 +62,13 @@ 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_master, inverted),' - `SSP_CLOCK(fsync, 16000, codec_master),' + `SSP_CLOCK(bclk, 256000, codec_provider, inverted),' + `SSP_CLOCK(fsync, 16000, codec_provider),' `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_master, inverted),' - `SSP_CLOCK(fsync, 8000, codec_master),' + `SSP_CLOCK(bclk, 128000, codec_provider, inverted),' + `SSP_CLOCK(fsync, 8000, codec_provider),' `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),' diff --git a/tools/topology/topology1/sof-adl-nau8825.m4 b/tools/topology/topology1/sof-adl-nau8825.m4 index 318b7dcb2b27..f15b5a022741 100644 --- a/tools/topology/topology1/sof-adl-nau8825.m4 +++ b/tools/topology/topology1/sof-adl-nau8825.m4 @@ -330,7 +330,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_master, polarity) +dnl SSP_CLOCK(clock, freq, codec_provider, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) dnl mclk_id is optional dnl ssp1-maxmspk diff --git a/tools/topology/topology1/sof-apl-pcm512x.m4 b/tools/topology/topology1/sof-apl-pcm512x.m4 index f5915afe0819..d3d0ff1131b1 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_master), - SSP_CLOCK(fsync, FSYNC, codec_master), + SSP_CLOCK(bclk, eval(FSYNC * 64), codec_provider), + SSP_CLOCK(fsync, FSYNC, codec_provider), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) ' diff --git a/tools/topology/topology1/sof-apl-wm8804.m4 b/tools/topology/topology1/sof-apl-wm8804.m4 index 5ae7cf6b6454..86abd9f51d56 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_master), - SSP_CLOCK(fsync, 48000, codec_master), + SSP_CLOCK(bclk, 3072000, codec_provider), + SSP_CLOCK(fsync, 48000, codec_provider), SSP_TDM(2, 32, 3, 3), SSP_CONFIG_DATA(SSP, 5, 24))) diff --git a/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 index b19f1ede94b8..cf352a97c1ad 100644 --- a/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 @@ -122,8 +122,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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), SAI_TDM(2, 16, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0))) diff --git a/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 b/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 index 54b8157a44a9..44e2ecf8e83b 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_master), - SAI_CLOCK(fsync, 16000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 16000, codec_provider), 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 8e5e52a30f78..409c0ffa7c5a 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), 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 65659bac4afd..ea9903f67f9c 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), 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 97622bf047db..5b71cdec0b71 100644 --- a/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 @@ -120,7 +120,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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), 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 9f03a58ac72d..61bb1ce513b0 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_master), - SAI_CLOCK(fsync, 16000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 16000, codec_provider), 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 6aa2a44ef579..24dbdd771648 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), 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 9acc5baf34ff..b77c3be532cc 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_master), - SAI_CLOCK(fsync, 48000, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, 48000, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0))) diff --git a/tools/topology/topology1/sof-jsl-da7219.m4 b/tools/topology/topology1/sof-jsl-da7219.m4 index 36980f7850f5..418eb5f4ea6e 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_master, polarity) +dnl SSP_CLOCK(clock, freq, codec_provider, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) dnl mclk_id is optional diff --git a/tools/topology/topology1/sof-jsl-rt5682.m4 b/tools/topology/topology1/sof-jsl-rt5682.m4 index 06a64d70e20d..06a9e3f51daa 100644 --- a/tools/topology/topology1/sof-jsl-rt5682.m4 +++ b/tools/topology/topology1/sof-jsl-rt5682.m4 @@ -169,7 +169,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_master, polarity) +dnl SSP_CLOCK(clock, freq, codec_provider, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) # SSP 0 (ID: 0) ALC5682 diff --git a/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 b/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 index fd7686f262a0..9ce5571db405 100644 --- a/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 +++ b/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 @@ -406,7 +406,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_master, polarity) +dnl SSP_CLOCK(clock, freq, codec_provider, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) dnl mclk_id is optional dnl ssp1-maxmspk diff --git a/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 b/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 index b9d650480f6b..78e4bcd41cb4 100644 --- a/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 +++ b/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 @@ -227,7 +227,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_master, polarity) +dnl SSP_CLOCK(clock, freq, codec_provider, polarity) dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) dnl mclk_id is optional dnl ssp1-maxmspk, ssp0-RTHeadset