Unverified Commit 0dc97472 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: uda1380: Use modern ASoC DAI format terminology 



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

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220223003707.1903798-1-broonie@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 10daafb0

sound/soc/codecs/uda1380.c

+5 −5
Original line number Diff line number Diff line
@@ -435,8 +435,8 @@ static int uda1380_set_dai_fmt_both(struct snd_soc_dai *codec_dai, 
		iface |= R01_SFORI_MSB | R01_SFORO_MSB;

	}



	/* DATAI is slave only, so in single-link mode, this has to be slave */

	if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)

	/* DATAI is consumer only */

	if ((fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) != SND_SOC_DAIFMT_CBC_CFC)

		return -EINVAL;



	uda1380_write_reg_cache(component, UDA1380_IFACE, iface);
@@ -465,8 +465,8 @@ static int uda1380_set_dai_fmt_playback(struct snd_soc_dai *codec_dai, 
		iface |= R01_SFORI_MSB;

	}



	/* DATAI is slave only, so this has to be slave */

	if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)

	/* DATAI is consumer only */

	if ((fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) != SND_SOC_DAIFMT_CBC_CFC)

		return -EINVAL;



	uda1380_write(component, UDA1380_IFACE, iface);
@@ -495,7 +495,7 @@ static int uda1380_set_dai_fmt_capture(struct snd_soc_dai *codec_dai, 
		iface |= R01_SFORO_MSB;

	}



	if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBM_CFM)

	if ((fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) == SND_SOC_DAIFMT_CBP_CFP)

		iface |= R01_SIM;



	uda1380_write(component, UDA1380_IFACE, iface);