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

Commit c264301c authored by Lopez Cruz, Misael's avatar Lopez Cruz, Misael Committed by Mark Brown
Browse files

ASoC: TWL4030: Fix voice interface clock masters 



Voice interface of twl4030 codec supports: CBM_CFM and
CBS_CFS. It doesn't support CBS_CFM.

Signed-off-by: default avatarMisael Lopez Cruz <x0052729@ti.com>
Acked-By: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e370f45a

sound/soc/codecs/twl4030.c

+1 −1
Original line number Diff line number Diff line
@@ -1946,7 +1946,7 @@ static int twl4030_voice_set_dai_fmt(struct snd_soc_dai *codec_dai, 


	/* set master/slave audio interface */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFM:

	case SND_SOC_DAIFMT_CBM_CFM:

		format &= ~(TWL4030_VIF_SLAVE_EN);

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

sound/soc/omap/sdp3430.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int sdp3430_hw_voice_params(struct snd_pcm_substream *substream, 
	ret = snd_soc_dai_set_fmt(codec_dai,

				SND_SOC_DAIFMT_DSP_A |

				SND_SOC_DAIFMT_IB_NF |

				SND_SOC_DAIFMT_CBS_CFM);

				SND_SOC_DAIFMT_CBM_CFM);

	if (ret) {

		printk(KERN_ERR "can't set codec DAI configuration\n");

		return ret;

sound/soc/omap/zoom2.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int zoom2_hw_voice_params(struct snd_pcm_substream *substream, 
	ret = snd_soc_dai_set_fmt(codec_dai,

				SND_SOC_DAIFMT_DSP_A |

				SND_SOC_DAIFMT_IB_NF |

				SND_SOC_DAIFMT_CBS_CFM);

				SND_SOC_DAIFMT_CBM_CFM);

	if (ret) {

		printk(KERN_ERR "can't set codec DAI configuration\n");

		return ret;