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

Commit 81971a14 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Jaroslav Kysela
Browse files

ALSA: ASoC: TLV320AIC3X: Modify only interface related bits in aic3x_set_dai_fmt 



Those two serial data interface control register bits have also other
functions and they can be set before aic3x_set_dai_fmt is called.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 0bd72a3d

sound/soc/codecs/tlv320aic3x.c

+4 −2
Original line number Diff line number Diff line
@@ -809,8 +809,10 @@ static int aic3x_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 
{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct aic3x_priv *aic3x = codec->private_data;

	u8 iface_areg = 0;

	u8 iface_breg = 0;

	u8 iface_areg, iface_breg;



	iface_areg = aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLA) & 0x3f;

	iface_breg = aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLB) & 0x3f;



	/* set master/slave audio interface */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {