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

ASoC: max98927: Use modern ASoC DAI format terminology

As part of moving to remove the old style defines for the bus clocks update
the max98927 driver to use more modern terminology for clocking.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220222234026.712070-10-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

+7 -6
+6 -5
sound/soc/codecs/max98927.c
··· 148 148 149 149 dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt); 150 150 151 - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { 152 - case SND_SOC_DAIFMT_CBS_CFS: 151 + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { 152 + case SND_SOC_DAIFMT_CBC_CFC: 153 + max98927->provider = false; 153 154 mode = MAX98927_PCM_MASTER_MODE_SLAVE; 154 155 break; 155 - case SND_SOC_DAIFMT_CBM_CFM: 156 - max98927->master = true; 156 + case SND_SOC_DAIFMT_CBP_CFP: 157 + max98927->provider = true; 157 158 mode = MAX98927_PCM_MASTER_MODE_MASTER; 158 159 break; 159 160 default: ··· 271 270 int blr_clk_ratio = params_channels(params) * max98927->ch_size; 272 271 int value; 273 272 274 - if (max98927->master) { 273 + if (max98927->provider) { 275 274 int i; 276 275 /* match rate to closest value */ 277 276 for (i = 0; i < ARRAY_SIZE(rate_table); i++) {
+1 -1
sound/soc/codecs/max98927.h
··· 264 264 unsigned int ch_size; 265 265 unsigned int rate; 266 266 unsigned int iface; 267 - unsigned int master; 267 + unsigned int provider; 268 268 unsigned int digital_gain; 269 269 bool tdm_mode; 270 270 };