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

2 files changed, 19 insertions, 21 deletions

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 023b3f06b728..aaff7671101b 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -907,21 +907,20 @@ static struct platform_device fsi_device = {
         .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 = {
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 975608f5e805..4010e63e82d8 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -299,22 +299,21 @@ static struct platform_device fsi_device = {
         .resource       = fsi_resources,
 };
 
-static struct asoc_simple_dai_init_info fsi2_ak4642_init_info = {
-        .fmt            = SND_SOC_DAIFMT_LEFT_J,
-        .codec_daifmt   = SND_SOC_DAIFMT_CBM_CFM,
-        .cpu_daifmt     = SND_SOC_DAIFMT_CBS_CFS |
-                          SND_SOC_DAIFMT_IB_NF,
-        .sysclk         = 11289600,
-};
-
 static struct asoc_simple_card_info fsi_ak4642_info = {
         .name           = "AK4642",
         .card           = "FSIA-AK4642",
-        .cpu_dai        = "fsia-dai",
         .codec          = "ak4642-codec.0-0012",
         .platform       = "sh_fsi.0",
-        .codec_dai      = "ak4642-hifi",
-        .init           = &fsi2_ak4642_init_info,
+        .daifmt         = SND_SOC_DAIFMT_LEFT_J,
+        .cpu_dai = {
+                .name   = "fsia-dai",
+                .fmt    = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_IB_NF,
+        },
+        .codec_dai = {
+                .name   = "ak4642-hifi",
+                .fmt    = SND_SOC_DAIFMT_CBM_CFM,
+                .sysclk = 11289600,
+        },
 };
 
 static struct platform_device fsi_ak4642_device = {