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

Commit 673847cf authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Use dai_fmt in hx4700 machine driver 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5b48a5a6

sound/soc/pxa/hx4700.c

+2 −14
Original line number Diff line number Diff line
@@ -65,20 +65,6 @@ static int hx4700_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int ret = 0;



	/* set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai,

			SND_SOC_DAIFMT_MSB | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai,

			SND_SOC_DAIFMT_MSB | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* set the I2S system clock as output */

	ret = snd_soc_dai_set_sysclk(cpu_dai, PXA2XX_I2S_SYSCLK, 0,

			SND_SOC_CLOCK_OUT);
@@ -175,6 +161,8 @@ static struct snd_soc_dai_link hx4700_dai = { 
	.platform_name = "pxa-pcm-audio",

	.codec_name = "ak4641.0-0012",

	.init = hx4700_ak4641_init,

	.dai_fmt = SND_SOC_DAIFMT_MSB | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBS_CFS,

	.ops = &hx4700_ops,

};