From 3d71a9f1f98e875a7ae70f77a318252a2bc0a70a Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Fri, 3 Nov 2023 14:58:41 -0700 Subject: [PATCH] tools/topology1: mass replace codec_master -> codec_provider This removes a lot of warning noise and may help spot other warnings like `ALSA lib ops.c:48:(lookup_ops) wrong kcontrol ops value string ''` and others. Now that commit 1b1ec6c4920f ("topology/cmake: skip all topologies when alsatplg < 1.2.5") enforces alsatplg version >= 1.2.5, it is finally safe to do this! I compared the generated .tplg files before/after this commit and they're bit for bit identical. Tested with both alsatplg v2.6.1 from Ubuntu 22 and version 1.2.9 from the SOF docker container. Note this is a much smaller commit than the reverted commit f50b6fe0adc4 ("topologies: switch all .m4 files to codec_provider and codec_consumer") because most topologies v1 have been removed from the main branch. Most topologies v1 are now only in stable-v2.2 where the warning spam is still a problem :-( Signed-off-by: Marc Herbert --- .../sof-imx8-compr-pcm-cap-wm8960.m4 | 4 +-- .../development/sof-imx8-compr-pcm-wm8960.m4 | 4 +-- .../development/sof-imx8-compr-wm8960.m4 | 8 ++--- .../development/sof-imx8-src-cs42888.m4 | 4 +-- .../development/sof-imx8-src-wm8960.m4 | 8 ++--- .../sof-imx8mp-compr-pcm-cap-wm8960.m4 | 4 +-- .../sof-imx8mp-compr-pcm-wm8960.m4 | 4 +-- .../development/sof-imx8mp-compr-wm8960.m4 | 8 ++--- .../topology1/platform/common/acp-hs.m4 | 2 +- .../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 +- tools/topology/topology1/sof-acp-renoir.m4 | 4 +-- .../topology/topology1/sof-acp-rmb-dmic4ch.m4 | 8 ++--- ...acp-rmb-tdm8ch-dmic2ch-nau8825-max98360.m4 | 8 ++--- ...of-acp-rmb-tdm8ch-dmic4ch-rt5682-rt1019.m4 | 8 ++--- tools/topology/topology1/sof-acp-rmb.m4 | 8 ++--- tools/topology/topology1/sof-acp-vangogh.m4 | 8 ++--- tools/topology/topology1/sof-acp_6_3.m4 | 6 ++-- tools/topology/topology1/sof-cavs-nocodec.m4 | 36 +++++++++---------- .../sof-eq-iir-dts-codec-smart-amplifier.m4 | 4 +-- .../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 +-- .../topology1/sof-imx8-wm8960-cs42888.m4 | 8 ++--- .../topology/topology1/sof-imx8-wm8960-kwd.m4 | 4 +-- .../topology1/sof-imx8-wm8960-mixer.m4 | 8 ++--- tools/topology/topology1/sof-imx8-wm8960.m4 | 8 ++--- .../topology1/sof-imx8mp-btsco-dual-8ch.m4 | 2 +- .../topology1/sof-imx8mp-wm8960-kwd.m4 | 4 +-- tools/topology/topology1/sof-imx8ulp-btsco.m4 | 4 +-- tools/topology/topology1/sof-imx93-wm8962.m4 | 4 +-- .../topology1/sof-rn-rt5682-max98360.m4 | 4 +-- .../topology1/sof-rn-rt5682-rt1019.m4 | 4 +-- .../topology/topology1/sof-smart-amplifier.m4 | 4 +-- .../pipe-low-latency-playback_mux_tdm4ch.m4 | 4 +-- 39 files changed, 111 insertions(+), 111 deletions(-) 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 436148af13d5..c1f5db6eb6c1 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 @@ -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, 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 f20985a6bb47..2aaea2434105 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-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, 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-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-wm8960.m4 index 945b70f5d6dc..9c4e4d1c9701 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-wm8960.m4 @@ -103,14 +103,14 @@ DAI_CONFIG(SAI, 1, 0, DAI_BE_NAME, ifelse( CODEC, `wm8960', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, `RATE', codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, `RATE', codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 1, 0)))', CODEC, `wm8962', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, `RATE', codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, `RATE', codec_provider), 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 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-imx8-src-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 index db7e86c1b5a7..e8a0f39a4939 100644 --- a/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 @@ -89,14 +89,14 @@ DAI_CONFIG(SAI, SAI_INDEX, 0, DAI_BE_NAME, ifelse( CODEC, `wm8960', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, RATE, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, RATE, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, SAI_INDEX, 0)))', CODEC, `wm8962', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, `RATE', codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, `RATE', codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, SAI_INDEX, 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 e2cf0a2f22d6..9eb27880c4f5 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 @@ -86,7 +86,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 d72e2ce6540d..c518430b01c5 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4 @@ -86,7 +86,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-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-compr-wm8960.m4 index 72a7b62ac7cc..e74caff6b27c 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-wm8960.m4 @@ -104,14 +104,14 @@ DAI_CONFIG(SAI, 3, 0, DAI_BE_NAME, ifelse( CODEC, `wm8960', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, `RATE', codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, `RATE', codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, 3, 0)))', CODEC, `wm8962', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, `RATE', codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, `RATE', 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 2094d35b0f12..2dc74df3eabc 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 acf8fb0f556f..e76ec1432c7d 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 389daaaf5a5a..888308c714d4 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/sof-acp-renoir.m4 b/tools/topology/topology1/sof-acp-renoir.m4 index 09052f25b7ca..2debdfa0f8a4 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, 0))) # Capture pipeline 2 on PCM 0 using max 2 channels of s16le. diff --git a/tools/topology/topology1/sof-acp-rmb-dmic4ch.m4 b/tools/topology/topology1/sof-acp-rmb-dmic4ch.m4 index bba80efee423..4bf45dccbae4 100644 --- a/tools/topology/topology1/sof-acp-rmb-dmic4ch.m4 +++ b/tools/topology/topology1/sof-acp-rmb-dmic4ch.m4 @@ -30,8 +30,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, 0))) PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, @@ -45,8 +45,8 @@ PIPELINE_SOURCE_2, 2, s16le, 2000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) DAI_CONFIG(ACPHS, 1, 1, acp-amp-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, 1, 48000, 2, 0))) diff --git a/tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic2ch-nau8825-max98360.m4 b/tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic2ch-nau8825-max98360.m4 index 4be6362334c4..2c6b89e9c672 100644 --- a/tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic2ch-nau8825-max98360.m4 +++ b/tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic2ch-nau8825-max98360.m4 @@ -95,8 +95,8 @@ DAI_ADD(sof/pipe-virtual-playback-passthrough.m4, DAI_CONFIG(ACPHS, 1, 1, acp-amp-codec, ACPHS_CONFIG(DSP_A, 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(8, 32, 3, 3),ACPHS_CONFIG_DATA(ACPHS, 1, 48000, 8, 1))) #/**********************************************************************************/ # PCM Playback pipeline 4 on PCM 1 using max 2 channels of s16le. @@ -168,8 +168,8 @@ PCM_DUPLEX_ADD(Low Latency, 0, PIPELINE_PCM_3, PIPELINE_PCM_2) # BE configurations - DAI_CONFIG(ACPHS, 0, 0, acp-headset-codec, ACPHS_CONFIG(DSP_A, 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(8, 32, 3, 3),ACPHS_CONFIG_DATA(ACPHS, 0, 48000, 8, 1))) #/**********************************************************************************/ diff --git a/tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic4ch-rt5682-rt1019.m4 b/tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic4ch-rt5682-rt1019.m4 index 5f4524cf6113..c4e484f6a0d2 100644 --- a/tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic4ch-rt5682-rt1019.m4 +++ b/tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic4ch-rt5682-rt1019.m4 @@ -95,8 +95,8 @@ DAI_ADD(sof/pipe-virtual-playback-passthrough.m4, DAI_CONFIG(ACPHS, 1, 1, acp-amp-codec, ACPHS_CONFIG(DSP_A, 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(8, 32, 3, 3),ACPHS_CONFIG_DATA(ACPHS, 1, 48000, 8, 1))) #/**********************************************************************************/ @@ -169,8 +169,8 @@ PCM_DUPLEX_ADD(Low Latency, 0, PIPELINE_PCM_3, PIPELINE_PCM_2) # BE configurations - DAI_CONFIG(ACPHS, 0, 0, acp-headset-codec, ACPHS_CONFIG(DSP_A, 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(8, 32, 3, 3),ACPHS_CONFIG_DATA(ACPHS, 0, 48000, 8, 1))) #/**********************************************************************************/ diff --git a/tools/topology/topology1/sof-acp-rmb.m4 b/tools/topology/topology1/sof-acp-rmb.m4 index f2b24a796453..d5945f9ee778 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, 0))) PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, @@ -46,8 +46,8 @@ PIPELINE_SOURCE_2, 2, s16le, 2000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) DAI_CONFIG(ACPHS, 1, 1, acp-amp-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, 1, 48000, 2, 0))) diff --git a/tools/topology/topology1/sof-acp-vangogh.m4 b/tools/topology/topology1/sof-acp-vangogh.m4 index 27cfbc96da79..4c313ec608c2 100644 --- a/tools/topology/topology1/sof-acp-vangogh.m4 +++ b/tools/topology/topology1/sof-acp-vangogh.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, 0))) PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, @@ -46,8 +46,8 @@ PIPELINE_SOURCE_2, 2, s16le, 2000, 0, 0, SCHEDULE_TIME_DOMAIN_DMA) DAI_CONFIG(ACPHS, 1, 1, acp-amp-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, 1, 48000, 2, 0))) diff --git a/tools/topology/topology1/sof-acp_6_3.m4 b/tools/topology/topology1/sof-acp_6_3.m4 index 88204638d9ac..1923d93acf8e 100644 --- a/tools/topology/topology1/sof-acp_6_3.m4 +++ b/tools/topology/topology1/sof-acp_6_3.m4 @@ -46,14 +46,14 @@ DAI_ADD(sof/pipe-dai-playback.m4, dnl DAI_CONFIG(type, dai_index, link_id, name, acphs_config/acpdmic_config) dnl ACPHS_CONFIG(format, mclk, bclk, fsync, tdm, acphs_config_data) -dnl ACP_CLOCK(clock, freq, codec_master, polarity) +dnl ACP_CLOCK(clock, freq, codec_provider, polarity) dnl ACPHS_CONFIG_DATA(type, idx, valid bits, mclk_id) dnl mclk_id is optional 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, 0))) #=========================================================================== diff --git a/tools/topology/topology1/sof-cavs-nocodec.m4 b/tools/topology/topology1/sof-cavs-nocodec.m4 index ba5f741f26e2..0b913fc68f82 100644 --- a/tools/topology/topology1/sof-cavs-nocodec.m4 +++ b/tools/topology/topology1/sof-cavs-nocodec.m4 @@ -249,8 +249,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) @@ -259,16 +259,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)))) @@ -279,24 +279,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)))) @@ -306,24 +306,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-eq-iir-dts-codec-smart-amplifier.m4 b/tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 index e76cb4292d5d..a9040132688a 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 @@ -226,8 +226,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-imx8-compr-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 index 5ead8841e5b9..de4943525395 100644 --- a/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 @@ -132,7 +132,7 @@ COMPR_PLAYBACK_ADD(PCM Deep Buffer, 1, PIPELINE_PCM_4) # DAI_CONFIG(SAI, SAI_INDEX, 0, DAI_BE_NAME, 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, SAI_INDEX, 0))) 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-imx8-wm8960-cs42888.m4 b/tools/topology/topology1/sof-imx8-wm8960-cs42888.m4 index 150846069197..3864add58a46 100644 --- a/tools/topology/topology1/sof-imx8-wm8960-cs42888.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960-cs42888.m4 @@ -104,15 +104,15 @@ PCM_DUPLEX_ADD(Port1, 1, PIPELINE_PCM_3, PIPELINE_PCM_4) 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))) 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-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 ed2c63ea13ce..b310b76323fd 100644 --- a/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 @@ -113,14 +113,14 @@ DAI_CONFIG(SAI, SAI_INDEX, 0, DAI_BE_NAME, ifelse( CODEC, `wm8960', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, RATE, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, RATE, codec_provider), SAI_TDM(2, 16, 3, 3), SAI_CONFIG_DATA(SAI, SAI_INDEX, 0)))', CODEC, `wm8962', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, RATE, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, RATE, codec_provider), SAI_TDM(2, 16, 3, 3), SAI_CONFIG_DATA(SAI, SAI_INDEX, 0)))', ) diff --git a/tools/topology/topology1/sof-imx8-wm8960.m4 b/tools/topology/topology1/sof-imx8-wm8960.m4 index e7339ae60bf2..3628bc5392e9 100644 --- a/tools/topology/topology1/sof-imx8-wm8960.m4 +++ b/tools/topology/topology1/sof-imx8-wm8960.m4 @@ -90,8 +90,8 @@ DAI_CONFIG(SAI, SAI_INDEX, 0, DAI_BE_NAME, ifelse( CODEC, `wm8960', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, RATE, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, RATE, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, SAI_INDEX, 0)))', CODEC, `wm8904', ` @@ -102,8 +102,8 @@ ifelse( SAI_CONFIG_DATA(SAI, SAI_INDEX, 0)))', CODEC, `wm8962', ` SAI_CONFIG(I2S, SAI_CLOCK(mclk, 12288000, codec_mclk_in), - SAI_CLOCK(bclk, 3072000, codec_master), - SAI_CLOCK(fsync, RATE, codec_master), + SAI_CLOCK(bclk, 3072000, codec_provider), + SAI_CLOCK(fsync, RATE, codec_provider), SAI_TDM(2, 32, 3, 3), SAI_CONFIG_DATA(SAI, SAI_INDEX, 0)))', ) diff --git a/tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4 b/tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4 index 6abb1e4e0755..8c581b7a760a 100644 --- a/tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4 +++ b/tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4 @@ -104,7 +104,7 @@ PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) PCM_DUPLEX_ADD(Port1, 1, PIPELINE_PCM_3, PIPELINE_PCM_4) dnl DAI_CONFIG(type, dai_index, link_id, name, sai_config) -dnl SAI_CLOCK: clock, freq, codec_master, polarity (optional) +dnl SAI_CLOCK: clock, freq, codec_provider, polarity (optional) dnl SAI_TDM: number of channels, word width, tx mask, rx mask: decimal channel enable bits dnl SAI_CONFIG_DATA: index, mclk_id (optional) 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-imx8ulp-btsco.m4 b/tools/topology/topology1/sof-imx8ulp-btsco.m4 index a1ce55b3fd0a..4e1492f22445 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, `RATE', codec_slave), + SAI_CLOCK(bclk, 256000, codec_consumer), + SAI_CLOCK(fsync, `RATE', codec_consumer), SAI_TDM(1, 16, 1, 1), SAI_CONFIG_DATA(SAI, 5, 0))) diff --git a/tools/topology/topology1/sof-imx93-wm8962.m4 b/tools/topology/topology1/sof-imx93-wm8962.m4 index 0e99ce292db8..836d6fb77be6 100644 --- a/tools/topology/topology1/sof-imx93-wm8962.m4 +++ b/tools/topology/topology1/sof-imx93-wm8962.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-wm8962, 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-rn-rt5682-max98360.m4 b/tools/topology/topology1/sof-rn-rt5682-max98360.m4 index 3965042c7499..103412db299e 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, 0))) diff --git a/tools/topology/topology1/sof-rn-rt5682-rt1019.m4 b/tools/topology/topology1/sof-rn-rt5682-rt1019.m4 index 79e621110865..5d87210b4fe9 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, 0))) diff --git a/tools/topology/topology1/sof-smart-amplifier.m4 b/tools/topology/topology1/sof-smart-amplifier.m4 index 054c14684fd0..38d4b5872d78 100644 --- a/tools/topology/topology1/sof-smart-amplifier.m4 +++ b/tools/topology/topology1/sof-smart-amplifier.m4 @@ -234,8 +234,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/pipe-low-latency-playback_mux_tdm4ch.m4 b/tools/topology/topology1/sof/pipe-low-latency-playback_mux_tdm4ch.m4 index 1a69cf3a38de..97a44d6eaf7e 100644 --- a/tools/topology/topology1/sof/pipe-low-latency-playback_mux_tdm4ch.m4 +++ b/tools/topology/topology1/sof/pipe-low-latency-playback_mux_tdm4ch.m4 @@ -73,8 +73,8 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, #DAI_CONFIG(ACPSP1, 1, 1, acp-amp-codec, # ACPSP1_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(4, 32, 3, 3),ACPSP1_CONFIG_DATA(ACPSP1, 1, 48000, 4))) #