ASoC: sh: fsi: use simple-card instead of fsi-da7210

This patch uses simple-card driver instead of fsi-da7210 on each board.
To select DA7210 driver, each boards select it on Kconfig.

This patch removes fsi-da7210 driver which is no longer needed

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

2 files changed, 27 insertions, 0 deletions

diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 0da49f3b0f4f..c0241bd584f4 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -224,6 +224,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 d12fe9ddf3da..299a40a44c92 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -32,6 +32,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>
@@ -809,6 +810,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] = {
@@ -945,6 +970,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)