3 files changed, 40 insertions, 3 deletions

diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 3a74b10922e6..1f56b35d3248 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -54,6 +54,7 @@ config SH_7724_SOLUTION_ENGINE
         select SOLUTION_ENGINE
         depends on CPU_SUBTYPE_SH7724
         select ARCH_REQUIRE_GPIOLIB
+        select SND_SOC_AK4642 if SND_SIMPLE_CARD
         help
           Select 7724 SolutionEngine if configuring for a Hitachi SH7724
           evaluation board.
@@ -224,6 +225,7 @@ config SH_ECOVEC
         bool "EcoVec"
         depends on CPU_SUBTYPE_SH7724
         select ARCH_REQUIRE_GPIOLIB
+        select SND_SOC_DA7210 if SND_SIMPLE_CARD
         help
           Renesas "R0P7724LC0011/21RL (EcoVec)" support.
 
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 63002c8a0ec8..4158d70c0dea 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -33,6 +33,7 @@
 #include <linux/videodev2.h>
 #include <video/sh_mobile_lcdc.h>
 #include <sound/sh_fsi.h>
+#include <sound/simple_card.h>
 #include <media/sh_mobile_ceu.h>
 #include <media/soc_camera.h>
 #include <media/tw9910.h>
@@ -811,6 +812,30 @@ static struct platform_device fsi_device = {
         },
 };
 
+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,
+};
+
+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,
+};
+
+static struct platform_device fsi_da7210_device = {
+        .name   = "asoc-simple-card",
+        .dev    = {
+                .platform_data  = &fsi_da7210_info,
+        },
+};
+
+
 /* IrDA */
 static struct resource irda_resources[] = {
         [0] = {
@@ -947,6 +972,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
         &camera_devices[1],
         &camera_devices[2],
         &fsi_device,
+        &fsi_da7210_device,
         &irda_device,
         &vou_device,
 #if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index dd931e36daf8..ffbf5bc7366b 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -29,6 +29,7 @@
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
 #include <sound/sh_fsi.h>
+#include <sound/simple_card.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
 #include <asm/clock.h>
@@ -305,17 +306,25 @@ static struct platform_device fsi_device = {
         },
 };
 
-static struct fsi_ak4642_info fsi_ak4642_info = {
+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,
+        .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",
-        .id             = FSI_PORT_A,
+        .codec_dai      = "ak4642-hifi",
+        .init           = &fsi2_ak4642_init_info,
 };
 
 static struct platform_device fsi_ak4642_device = {
-        .name   = "fsi-ak4642-audio",
+        .name   = "asoc-simple-card",
         .dev    = {
                 .platform_data  = &fsi_ak4642_info,
         },