Commit 44fdd433 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Use dai_fmt in speyside_wm8962 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 75d9ac46

sound/soc/samsung/speyside_wm8962.c

+2 −17
Original line number Diff line number Diff line
@@ -94,23 +94,6 @@ static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card, 
static int speyside_wm8962_hw_params(struct snd_pcm_substream *substream,

			      struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	int ret;



	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S

					 | SND_SOC_DAIFMT_NB_NF

					 | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S

					 | SND_SOC_DAIFMT_NB_NF

					 | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	sample_rate = params_rate(params);



	return 0;
@@ -128,6 +111,8 @@ static struct snd_soc_dai_link speyside_wm8962_dai[] = { 
		.codec_dai_name = "wm8962",

		.platform_name = "samsung-audio",

		.codec_name = "wm8962.1-001a",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		.ops = &speyside_wm8962_ops,

	},

};