openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Pierre-Louis Bossart 2020-11-12 10:30:59 -06:00 committed by Mark Brown
parent df132fa9da
commit 84b53a366e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/intel/atom/sst-atom-controls.c
View File

@ -827,14 +827,14 @@ static int sst_get_ssp_mode(struct snd_soc_dai *dai, unsigned int fmt)
{ {
int format; 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); dev_dbg(dai->dev, "Enter:%s, format=%x\n", __func__, format);
switch (format) { switch (format) {
case SND_SOC_DAIFMT_CBS_CFS: case SND_SOC_DAIFMT_CBC_CFC:
return SSP_MODE_MASTER; return SSP_MODE_PROVIDER;
case SND_SOC_DAIFMT_CBM_CFM: case SND_SOC_DAIFMT_CBP_CFP:
return SSP_MODE_SLAVE; return SSP_MODE_CONSUMER;
default: default:
dev_err(dai->dev, "Invalid ssp protocol: %d\n", format); 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, .ssp_id = SSP_CODEC,
.bits_per_slot = 24, .bits_per_slot = 24,
.slots = 4, .slots = 4,
.ssp_mode = SSP_MODE_MASTER, .ssp_mode = SSP_MODE_PROVIDER,
.pcm_mode = SSP_PCM_MODE_NETWORK, .pcm_mode = SSP_PCM_MODE_NETWORK,
.duplex = SSP_DUPLEX, .duplex = SSP_DUPLEX,
.ssp_protocol = SSP_MODE_PCM, .ssp_protocol = SSP_MODE_PCM,

4
sound/soc/intel/atom/sst-atom-controls.h
View File

@ -439,8 +439,8 @@ struct sst_cmd_tone_stop {
} __packed; } __packed;
enum sst_ssp_mode { enum sst_ssp_mode {
SSP_MODE_MASTER = 0, SSP_MODE_PROVIDER = 0,
SSP_MODE_SLAVE = 1, SSP_MODE_CONSUMER = 1,
}; };
enum sst_ssp_pcm_mode { enum sst_ssp_pcm_mode {