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

ASoC: max98925: Use modern ASoC DAI format terminology

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

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

+5 -8
+5 -8
sound/soc/codecs/max98925.c
··· 300 300 unsigned int invert = 0; 301 301 302 302 dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt); 303 - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { 304 - case SND_SOC_DAIFMT_CBS_CFS: 305 - /* set DAI to slave mode */ 303 + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { 304 + case SND_SOC_DAIFMT_CBC_CFC: 306 305 regmap_update_bits(max98925->regmap, 307 306 MAX98925_DAI_CLK_MODE2, 308 307 M98925_DAI_MAS_MASK, 0); 309 308 max98925_set_sense_data(max98925); 310 309 break; 311 - case SND_SOC_DAIFMT_CBM_CFM: 310 + case SND_SOC_DAIFMT_CBP_CFP: 312 311 /* 313 - * set left channel DAI to master mode, 314 - * right channel always slave 312 + * set left channel DAI to provider mode, 313 + * right channel always consumer 315 314 */ 316 315 regmap_update_bits(max98925->regmap, 317 316 MAX98925_DAI_CLK_MODE2, 318 317 M98925_DAI_MAS_MASK, M98925_DAI_MAS_MASK); 319 318 break; 320 - case SND_SOC_DAIFMT_CBS_CFM: 321 - case SND_SOC_DAIFMT_CBM_CFS: 322 319 default: 323 320 dev_err(component->dev, "DAI clock mode unsupported"); 324 321 return -EINVAL;