]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ASoC: Use dai_fmt in edb93xx machine driver
authorAxel Lin <axel.lin@gmail.com>
Sat, 17 Dec 2011 07:36:52 +0000 (15:36 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Dec 2011 00:51:59 +0000 (00:51 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Alexander Sverdlin <subaparts@yandex.ru>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/ep93xx/edb93xx.c

index 6b90c757cf4c1c60210ed6101bf0abc06bde6b95..9f6fecdf49e789c77f3e0fcaa4f8fb74a911b3af 100644 (file)
@@ -48,18 +48,6 @@ static int edb93xx_hw_params(struct snd_pcm_substream *substream,
        else
                mclk_rate = rate * 64 * 2;
 
-       err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                                 SND_SOC_DAIFMT_NB_IF |
-                                 SND_SOC_DAIFMT_CBS_CFS);
-       if (err)
-               return err;
-
-       err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                                 SND_SOC_DAIFMT_NB_IF |
-                                 SND_SOC_DAIFMT_CBS_CFS);
-       if (err)
-               return err;
-
        err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk_rate,
                                     SND_SOC_CLOCK_IN);
        if (err)
@@ -80,6 +68,8 @@ static struct snd_soc_dai_link edb93xx_dai = {
        .cpu_dai_name   = "ep93xx-i2s",
        .codec_name     = "spi0.0",
        .codec_dai_name = "cs4271-hifi",
+       .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
+                         SND_SOC_DAIFMT_CBS_CFS,
        .ops            = &edb93xx_ops,
 };