ASoC: SOF: Intel: use inclusive language for SSP clocks

We introduced provider/consumer terms, and CBP_CFP acronyms for codec
drivers, let's use them as well in SOF.

Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Keyon Jie <yang.jie@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220120231532.196926-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 33306d2023a78da909133207230f739957c22c2a..43de6f1d62a9426a633807bd22c7cc5a130dd90d 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -101,14 +101,14 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag)
                goto err;
        }
 
-       /* DSP is powered up, set all SSPs to slave mode */
+       /* DSP is powered up, set all SSPs to clock consumer/codec provider mode */
        for (i = 0; i < chip->ssp_count; i++) {
                snd_sof_dsp_update_bits_unlocked(sdev, HDA_DSP_BAR,
                                                 chip->ssp_base_offset
                                                 + i * SSP_DEV_MEM_SIZE
                                                 + SSP_SSC1_OFFSET,
-                                                SSP_SET_SLAVE,
-                                                SSP_SET_SLAVE);
+                                                SSP_SET_CBP_CFP,
+                                                SSP_SET_CBP_CFP);
        }
 
        /* step 2: purge FW request */

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 03a6bb7a165c6adf686a08f06364e959bdd607ab..7838a998ea95541450d2a687c3f239d7eabad608 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -383,9 +383,9 @@
 
 /* SSP Registers */
 #define SSP_SSC1_OFFSET                0x4
-#define SSP_SET_SCLK_SLAVE     BIT(25)
-#define SSP_SET_SFRM_SLAVE     BIT(24)
-#define SSP_SET_SLAVE          (SSP_SET_SCLK_SLAVE | SSP_SET_SFRM_SLAVE)
+#define SSP_SET_SCLK_CONSUMER  BIT(25)
+#define SSP_SET_SFRM_CONSUMER  BIT(24)
+#define SSP_SET_CBP_CFP                (SSP_SET_SCLK_CONSUMER | SSP_SET_SFRM_CONSUMER)
 
 #define HDA_IDISP_ADDR         2
 #define HDA_IDISP_CODEC(x) ((x) & BIT(HDA_IDISP_ADDR))