aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sh/Kconfig8
-rw-r--r--sound/soc/sh/Makefile2
-rw-r--r--sound/soc/sh/fsi-da7210.c81
3 files changed, 0 insertions, 91 deletions
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
46 This option enables generic sound support for the first 46 This option enables generic sound support for the first
47 AC97 unit of the SH7760. 47 AC97 unit of the SH7760.
48 48
49config SND_FSI_DA7210
50 tristate "FSI-DA7210 sound support"
51 depends on SND_SOC_SH4_FSI && I2C
52 select SND_SOC_DA7210
53 help
54 This option enables generic sound support for the
55 FSI - DA7210 unit
56
57config SND_SIU_MIGOR 49config SND_SIU_MIGOR
58 tristate "SIU sound support on Migo-R" 50 tristate "SIU sound support on Migo-R"
59 depends on SH_MIGOR 51 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
14 14
15## boards 15## boards
16snd-soc-sh7760-ac97-objs := sh7760-ac97.o 16snd-soc-sh7760-ac97-objs := sh7760-ac97.o
17snd-soc-fsi-da7210-objs := fsi-da7210.o
18snd-soc-migor-objs := migor.o 17snd-soc-migor-objs := migor.o
19 18
20obj-$(CONFIG_SND_SH7760_AC97) += snd-soc-sh7760-ac97.o 19obj-$(CONFIG_SND_SH7760_AC97) += snd-soc-sh7760-ac97.o
21obj-$(CONFIG_SND_FSI_DA7210) += snd-soc-fsi-da7210.o
22obj-$(CONFIG_SND_SIU_MIGOR) += snd-soc-migor.o 20obj-$(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 @@
1/*
2 * fsi-da7210.c
3 *
4 * Copyright (C) 2009 Renesas Solutions Corp.
5 * Kuninori Morimoto <morimoto.kuninori@renesas.com>
6 *
7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation; either version 2 of the License, or (at your
10 * option) any later version.
11 */
12
13#include <linux/platform_device.h>
14#include <linux/module.h>
15#include <sound/sh_fsi.h>
16
17static int fsi_da7210_init(struct snd_soc_pcm_runtime *rtd)
18{
19 struct snd_soc_dai *codec = rtd->codec_dai;
20 struct snd_soc_dai *cpu = rtd->cpu_dai;
21 int ret;
22
23 ret = snd_soc_dai_set_fmt(codec,
24 SND_SOC_DAIFMT_I2S |
25 SND_SOC_DAIFMT_CBM_CFM);
26 if (ret < 0)
27 return ret;
28
29 ret = snd_soc_dai_set_fmt(cpu, SND_SOC_DAIFMT_I2S |
30 SND_SOC_DAIFMT_CBS_CFS);
31
32 return ret;
33}
34
35static struct snd_soc_dai_link fsi_da7210_dai = {
36 .name = "DA7210",
37 .stream_name = "DA7210",
38 .cpu_dai_name = "fsib-dai", /* FSI B */
39 .codec_dai_name = "da7210-hifi",
40 .platform_name = "sh_fsi.0",
41 .codec_name = "da7210-codec.0-001a",
42 .init = fsi_da7210_init,
43};
44
45static struct snd_soc_card fsi_soc_card = {
46 .name = "FSI-DA7210",
47 .owner = THIS_MODULE,
48 .dai_link = &fsi_da7210_dai,
49 .num_links = 1,
50};
51
52static struct platform_device *fsi_da7210_snd_device;
53
54static int __init fsi_da7210_sound_init(void)
55{
56 int ret;
57
58 fsi_da7210_snd_device = platform_device_alloc("soc-audio", FSI_PORT_B);
59 if (!fsi_da7210_snd_device)
60 return -ENOMEM;
61
62 platform_set_drvdata(fsi_da7210_snd_device, &fsi_soc_card);
63 ret = platform_device_add(fsi_da7210_snd_device);
64 if (ret)
65 platform_device_put(fsi_da7210_snd_device);
66
67 return ret;
68}
69
70static void __exit fsi_da7210_sound_exit(void)
71{
72 platform_device_unregister(fsi_da7210_snd_device);
73}
74
75module_init(fsi_da7210_sound_init);
76module_exit(fsi_da7210_sound_exit);
77
78/* Module information */
79MODULE_DESCRIPTION("ALSA SoC FSI DA2710");
80MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori@renesas.com>");
81MODULE_LICENSE("GPL");