5 files changed, 27 insertions, 91 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)
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index 9ef49c89a001..c9fdf63e7156 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -46,14 +46,6 @@ config SND_SH7760_AC97
           This option enables generic sound support for the first
           AC97 unit of the SH7760.
 
-config SND_FSI_DA7210
-        tristate "FSI-DA7210 sound support"
-        depends on SND_SOC_SH4_FSI && I2C
-        select SND_SOC_DA7210
-        help
-          This option enables generic sound support for the
-          FSI - DA7210 unit
-
 config SND_SIU_MIGOR
         tristate "SIU sound support on Migo-R"
         depends on SH_MIGOR
diff --git a/sound/soc/sh/Makefile b/sound/soc/sh/Makefile
index f37fc3a22590..849b387d17d9 100644
--- a/sound/soc/sh/Makefile
+++ b/sound/soc/sh/Makefile
@@ -14,9 +14,7 @@ obj-$(CONFIG_SND_SOC_SH4_SIU)	+= snd-soc-siu.o
 
 ## boards
 snd-soc-sh7760-ac97-objs        := sh7760-ac97.o
-snd-soc-fsi-da7210-objs         := fsi-da7210.o
 snd-soc-migor-objs              := migor.o
 
 obj-$(CONFIG_SND_SH7760_AC97)   += snd-soc-sh7760-ac97.o
-obj-$(CONFIG_SND_FSI_DA7210)    += snd-soc-fsi-da7210.o
 obj-$(CONFIG_SND_SIU_MIGOR)     += snd-soc-migor.o
diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c
deleted file mode 100644
index 1dd3354c7411..000000000000
--- a/sound/soc/sh/fsi-da7210.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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 <linux/module.h>
-#include <sound/sh_fsi.h>
-
-static int fsi_da7210_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_dai *codec = rtd->codec_dai;
-        struct snd_soc_dai *cpu = rtd->cpu_dai;
-        int ret;
-
-        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,
-};
-
-static struct snd_soc_card fsi_soc_card = {
-        .name           = "FSI-DA7210",
-        .owner          = THIS_MODULE,
-        .dai_link       = &fsi_da7210_dai,
-        .num_links      = 1,
-};
-
-static struct platform_device *fsi_da7210_snd_device;
-
-static int __init fsi_da7210_sound_init(void)
-{
-        int ret;
-
-        fsi_da7210_snd_device = platform_device_alloc("soc-audio", FSI_PORT_B);
-        if (!fsi_da7210_snd_device)
-                return -ENOMEM;
-
-        platform_set_drvdata(fsi_da7210_snd_device, &fsi_soc_card);
-        ret = platform_device_add(fsi_da7210_snd_device);
-        if (ret)
-                platform_device_put(fsi_da7210_snd_device);
-
-        return ret;
-}
-
-static void __exit fsi_da7210_sound_exit(void)
-{
-        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");