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

ASoC: SOF: use inclusive language for bclk and fsync

Mirror alsa-lib definitions w/ codec_provider (CP) and
codec_consumer (CC).

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

authored by

Pierre-Louis Bossart and committed by
Mark Brown df132fa9 f026c123

+20 -14
+11 -5
include/sound/sof/dai.h
··· 34 34 #define SOF_DAI_FMT_IB_NF (3 << 8) /**< invert BCLK + nor FRM */ 35 35 #define SOF_DAI_FMT_IB_IF (4 << 8) /**< invert BCLK + FRM */ 36 36 37 - #define SOF_DAI_FMT_CBM_CFM (0 << 12) /**< codec clk & FRM master */ 38 - #define SOF_DAI_FMT_CBS_CFM (2 << 12) /**< codec clk slave & FRM master */ 39 - #define SOF_DAI_FMT_CBM_CFS (3 << 12) /**< codec clk master & frame slave */ 40 - #define SOF_DAI_FMT_CBS_CFS (4 << 12) /**< codec clk & FRM slave */ 37 + #define SOF_DAI_FMT_CBP_CFP (0 << 12) /**< codec bclk provider & frame provider */ 38 + #define SOF_DAI_FMT_CBC_CFP (2 << 12) /**< codec bclk consumer & frame provider */ 39 + #define SOF_DAI_FMT_CBP_CFC (3 << 12) /**< codec bclk provider & frame consumer */ 40 + #define SOF_DAI_FMT_CBC_CFC (4 << 12) /**< codec bclk consumer & frame consumer */ 41 + 42 + /* keep old definitions for backwards compatibility */ 43 + #define SOF_DAI_FMT_CBM_CFM SOF_DAI_FMT_CBP_CFP 44 + #define SOF_DAI_FMT_CBS_CFM SOF_DAI_FMT_CBC_CFP 45 + #define SOF_DAI_FMT_CBM_CFS SOF_DAI_FMT_CBP_CFC 46 + #define SOF_DAI_FMT_CBS_CFS SOF_DAI_FMT_CBC_CFC 41 47 42 48 #define SOF_DAI_FMT_FORMAT_MASK 0x000f 43 49 #define SOF_DAI_FMT_CLOCK_MASK 0x00f0 44 50 #define SOF_DAI_FMT_INV_MASK 0x0f00 45 - #define SOF_DAI_FMT_MASTER_MASK 0xf000 51 + #define SOF_DAI_FMT_CLOCK_PROVIDER_MASK 0xf000 46 52 47 53 /** \brief Types of DAI */ 48 54 enum sof_ipc_dai_type {
+9 -9
sound/soc/sof/topology.c
··· 2777 2777 struct sof_ipc_dai_config *config) 2778 2778 { 2779 2779 /* clock directions wrt codec */ 2780 - if (hw_config->bclk_provider == SND_SOC_TPLG_BCLK_CM) { 2781 - /* codec is bclk master */ 2782 - if (hw_config->fsync_provider == SND_SOC_TPLG_FSYNC_CM) 2783 - config->format |= SOF_DAI_FMT_CBM_CFM; 2780 + if (hw_config->bclk_provider == SND_SOC_TPLG_BCLK_CP) { 2781 + /* codec is bclk provider */ 2782 + if (hw_config->fsync_provider == SND_SOC_TPLG_FSYNC_CP) 2783 + config->format |= SOF_DAI_FMT_CBP_CFP; 2784 2784 else 2785 - config->format |= SOF_DAI_FMT_CBM_CFS; 2785 + config->format |= SOF_DAI_FMT_CBP_CFC; 2786 2786 } else { 2787 - /* codec is bclk slave */ 2788 - if (hw_config->fsync_provider == SND_SOC_TPLG_FSYNC_CM) 2789 - config->format |= SOF_DAI_FMT_CBS_CFM; 2787 + /* codec is bclk consumer */ 2788 + if (hw_config->fsync_provider == SND_SOC_TPLG_FSYNC_CP) 2789 + config->format |= SOF_DAI_FMT_CBC_CFP; 2790 2790 else 2791 - config->format |= SOF_DAI_FMT_CBS_CFS; 2791 + config->format |= SOF_DAI_FMT_CBC_CFC; 2792 2792 } 2793 2793 2794 2794 /* inverted clocks ? */