Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f2a9384 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mark Brown
Browse files

ASoC: UDA1380: DATAI is slave only 



Only allow SND_SOC_DAIFMT_CBS_CFS for the playback DAI.

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent aa4ef01d

sound/soc/codecs/uda1380.c

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

	}



	if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBM_CFM)

		iface |= R01_SIM;

	/* 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)

		return -EINVAL;



	uda1380_write(codec, UDA1380_IFACE, iface);
@@ -428,6 +429,10 @@ 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)

		return -EINVAL;



	uda1380_write(codec, UDA1380_IFACE, iface);



	return 0;