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 1b1ec6c ("topology/cmake: skip all topologies when alsatplg < 1.2.5") enforces alsatplg version >= 1.2.5, it is finally safe to do this! I compared the generated .tplg files before/after this commit and they're bit for bit identical. Tested with 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 f50b6fe ("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 <marc.herbert@intel.com>
marc-hb · Nov 3, 2023 · 3d71a9f · 3d71a9f
1 parent a6d65ee
commit 3d71a9f
Show file tree

Hide file tree

Showing 39 changed files with 111 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)))
 ')