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

Commit 2ce7f207 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Use dai_fmt in saarb 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 fe75fe0e

sound/soc/pxa/saarb.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -92,15 +92,6 @@ static int saarb_i2s_hw_params(struct snd_pcm_substream *substream, 
	if (ret < 0)

	if (ret < 0)

		return ret;

		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;

	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_tdm_slot(cpu_dai, 3, 3, 2, width);

	ret = snd_soc_dai_set_tdm_slot(cpu_dai, 3, 3, 2, width);





	return ret;

	return ret;
@@ -119,6 +110,8 @@ static struct snd_soc_dai_link saarb_dai[] = { 
		.platform_name	= "pxa-pcm-audio",

		.platform_name	= "pxa-pcm-audio",

		.codec_name	= "88pm860x-codec",

		.codec_name	= "88pm860x-codec",

		.init		= saarb_pm860x_init,

		.init		= saarb_pm860x_init,

		.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

				  SND_SOC_DAIFMT_CBM_CFM,

		.ops		= &saarb_i2s_ops,

		.ops		= &saarb_i2s_ops,

	},

	},

};

};