Merge remote-tracking branch 'asoc/topic/simple-card' into asoc-next

diff --combined arch/sh/boards/mach-ecovec24/setup.c
index 023b3f06b728d616d954571db9652465244b939f,065e9600fae68ea14c6a1e895cc9a9d447cb7e79..aaff7671101b301cedc1e30edf2055fc6aa008c8
--- 1/arch/sh/boards/mach-ecovec24/setup.c
--- 2/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@@ -70,16 -70,6 +70,16 @@@
   *                                  OFF-ON : MMC
   */
  
 +/*
 + * FSI - DA7210
 + *
 + * it needs amixer settings for playing
 + *
 + * amixer set 'HeadPhone' 80
 + * amixer set 'Out Mixer Left DAC Left' on
 + * amixer set 'Out Mixer Right DAC Right' on
 + */
 +
  /* Heartbeat */
  static unsigned char led_pos[] = { 0, 1, 2, 3 };
  
@@@ -907,21 -897,20 +907,20 @@@ static struct platform_device fsi_devic
        .resource       = fsi_resources,
  };
  
- static struct asoc_simple_dai_init_info fsi_da7210_init_info = {
-       .fmt            = SND_SOC_DAIFMT_I2S,
-       .codec_daifmt   = SND_SOC_DAIFMT_CBM_CFM,
-       .cpu_daifmt     = SND_SOC_DAIFMT_CBS_CFS |
-                         SND_SOC_DAIFMT_IB_NF,
- };
- 
  static struct asoc_simple_card_info fsi_da7210_info = {
        .name           = "DA7210",
        .card           = "FSIB-DA7210",
-       .cpu_dai        = "fsib-dai",
        .codec          = "da7210.0-001a",
        .platform       = "sh_fsi.0",
-       .codec_dai      = "da7210-hifi",
-       .init           = &fsi_da7210_init_info,
+       .daifmt         = SND_SOC_DAIFMT_I2S,
+       .cpu_dai = {
+               .name   = "fsib-dai",
+               .fmt    = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_IB_NF,
+       },
+       .codec_dai = {
+               .name   = "da7210-hifi",
+               .fmt    = SND_SOC_DAIFMT_CBM_CFM,
+       },
  };
  
  static struct platform_device fsi_da7210_device = {