CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/sh/fsi-da7210.c

 /*
  * fsi-da7210.c
  *
  * Copyright (C) 2009 Renesas Solutions Corp.
  * Kuninori Morimoto <morimoto.kuninori@renesas.com>
  *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the
  *  Free Software Foundation;  either version 2 of the  License, or (at your
  *  option) any later version.
  */
 
 #include <linux/platform_device.h>
 #include <sound/sh_fsi.h>
 
 static int fsi_da7210_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_dai *dai = rtd->codec_dai;
+        struct snd_soc_dai *codec = rtd->codec_dai;
+        struct snd_soc_dai *cpu = rtd->cpu_dai;
+        int ret;
 
-        return snd_soc_dai_set_fmt(dai,
-                                   SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+        ret = snd_soc_dai_set_fmt(codec,
+                                   SND_SOC_DAIFMT_I2S |
                                    SND_SOC_DAIFMT_CBM_CFM);
+        if (ret < 0)
+                return ret;
+
+        ret = snd_soc_dai_set_fmt(cpu, SND_SOC_DAIFMT_I2S |
+                                       SND_SOC_DAIFMT_CBS_CFS);
+
+        return ret;
 }
 
 static struct snd_soc_dai_link fsi_da7210_dai = {
         .name           = "DA7210",
         .stream_name    = "DA7210",
         .cpu_dai_name   = "fsib-dai", /* FSI B */
         .codec_dai_name = "da7210-hifi",
         .platform_name  = "sh_fsi.0",
         .codec_name     = "da7210-codec.0-001a",
         .init           = fsi_da7210_init,
@@ skipping 28 matching lines @@
         platform_device_unregister(fsi_da7210_snd_device);
 }
 
 module_init(fsi_da7210_sound_init);
 module_exit(fsi_da7210_sound_exit);
 
 /* Module information */
 MODULE_DESCRIPTION("ALSA SoC FSI DA2710");
 MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori@renesas.com>");
 MODULE_LICENSE("GPL");