Unverified Commit 84b53a36 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

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



Use 'provider' and 'consumer' terms.

Signed-off-by: default avatarPierre-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: default avatarMark Brown <broonie@kernel.org>
parent df132fa9

sound/soc/intel/atom/sst-atom-controls.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -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,

sound/soc/intel/atom/sst-atom-controls.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 {