ASoC: Intel: atom: use inclusive language for SSP bclk/fsync

Use 'provider' and 'consumer' terms.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20201112163100.5081-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
index 6b5a34a15acb856fb57dfd2de5a65e4f228bdc6a..335c3273299455f4045a1b451274b53d776a9b85 100644 (file)
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
@@ -827,14 +827,14 @@ static int sst_get_ssp_mode(struct snd_soc_dai *dai, unsigned int fmt)
 {
        int format;
 
-       format = (fmt & SND_SOC_DAIFMT_MASTER_MASK);
+       format = (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK);
        dev_dbg(dai->dev, "Enter:%s, format=%x\n", __func__, format);
 
        switch (format) {
-       case SND_SOC_DAIFMT_CBS_CFS:
-               return SSP_MODE_MASTER;
-       case SND_SOC_DAIFMT_CBM_CFM:
-               return SSP_MODE_SLAVE;
+       case SND_SOC_DAIFMT_CBC_CFC:
+               return SSP_MODE_PROVIDER;
+       case SND_SOC_DAIFMT_CBP_CFP:
+               return SSP_MODE_CONSUMER;
        default:
                dev_err(dai->dev, "Invalid ssp protocol: %d\n", format);
        }
@@ -905,7 +905,7 @@ static const struct sst_ssp_config sst_ssp_configs = {
        .ssp_id = SSP_CODEC,
        .bits_per_slot = 24,
        .slots = 4,
-       .ssp_mode = SSP_MODE_MASTER,
+       .ssp_mode = SSP_MODE_PROVIDER,
        .pcm_mode = SSP_PCM_MODE_NETWORK,
        .duplex = SSP_DUPLEX,
        .ssp_protocol = SSP_MODE_PCM,

diff --git a/sound/soc/intel/atom/sst-atom-controls.h b/sound/soc/intel/atom/sst-atom-controls.h
index 620b48d2a064760a60cdb121059b11c0062a6290..23bf37544a8d4f9843b34245bf4e9d83575578da 100644 (file)
--- a/sound/soc/intel/atom/sst-atom-controls.h
+++ b/sound/soc/intel/atom/sst-atom-controls.h
@@ -439,8 +439,8 @@ struct sst_cmd_tone_stop {
 } __packed;
 
 enum sst_ssp_mode {
-       SSP_MODE_MASTER = 0,
-       SSP_MODE_SLAVE = 1,
+       SSP_MODE_PROVIDER = 0,
+       SSP_MODE_CONSUMER = 1,
 };
 
 enum sst_ssp_pcm_mode {