Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Pierre-Louis Bossart and committed by
Mark Brown
84b53a36 df132fa9

+8 -8
+6 -6
sound/soc/intel/atom/sst-atom-controls.c
··· 827 827 { 828 828 int format; 829 829 830 - format = (fmt & SND_SOC_DAIFMT_MASTER_MASK); 830 + format = (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK); 831 831 dev_dbg(dai->dev, "Enter:%s, format=%x\n", __func__, format); 832 832 833 833 switch (format) { 834 - case SND_SOC_DAIFMT_CBS_CFS: 835 - return SSP_MODE_MASTER; 836 - case SND_SOC_DAIFMT_CBM_CFM: 837 - return SSP_MODE_SLAVE; 834 + case SND_SOC_DAIFMT_CBC_CFC: 835 + return SSP_MODE_PROVIDER; 836 + case SND_SOC_DAIFMT_CBP_CFP: 837 + return SSP_MODE_CONSUMER; 838 838 default: 839 839 dev_err(dai->dev, "Invalid ssp protocol: %d\n", format); 840 840 } ··· 905 905 .ssp_id = SSP_CODEC, 906 906 .bits_per_slot = 24, 907 907 .slots = 4, 908 - .ssp_mode = SSP_MODE_MASTER, 908 + .ssp_mode = SSP_MODE_PROVIDER, 909 909 .pcm_mode = SSP_PCM_MODE_NETWORK, 910 910 .duplex = SSP_DUPLEX, 911 911 .ssp_protocol = SSP_MODE_PCM,
+2 -2
sound/soc/intel/atom/sst-atom-controls.h
··· 439 439 } __packed; 440 440 441 441 enum sst_ssp_mode { 442 - SSP_MODE_MASTER = 0, 443 - SSP_MODE_SLAVE = 1, 442 + SSP_MODE_PROVIDER = 0, 443 + SSP_MODE_CONSUMER = 1, 444 444 }; 445 445 446 446 enum sst_ssp_pcm_mode {