Commit 36c1b400 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Use dai_fmt in z2 machine driver 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent c0e94231

sound/soc/pxa/z2.c

+2 −12
Original line number Diff line number Diff line
@@ -56,18 +56,6 @@ static int z2_hw_params(struct snd_pcm_substream *substream, 
		break;

	}



	/* set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

		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_I2S |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* set the codec system clock for DAC and ADC */

	ret = snd_soc_dai_set_sysclk(codec_dai, WM8750_SYSCLK, clk,

		SND_SOC_CLOCK_IN);
@@ -196,6 +184,8 @@ static struct snd_soc_dai_link z2_dai = { 
	.platform_name = "pxa-pcm-audio",

	.codec_name	= "wm8750.0-001b",

	.init		= z2_wm8750_init,

	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBS_CFS,

	.ops		= &z2_ops,

};