diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-12-31 05:51:49 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-02 08:04:25 -0500 |
commit | 57d61b9d2d7bc618b7b28a46310d9c2f086f8f51 (patch) | |
tree | 1e6a43bf0b2d318195fd545ac8b426460533e45c /sound/soc/omap/zoom2.c | |
parent | bd0b286e838ef1ca19bbe1cb55f0ec7e0135de1f (diff) |
ASoC: OMAP: Remove obsolete machine drivers for Zoom2 and SDP3430
These boards are using the common omap-twl4030 machine driver, no need for
separate machine drivers anymore.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap/zoom2.c')
-rw-r--r-- | sound/soc/omap/zoom2.c | 193 |
1 files changed, 0 insertions, 193 deletions
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c deleted file mode 100644 index 62a6b02d9b36..000000000000 --- a/sound/soc/omap/zoom2.c +++ /dev/null | |||
@@ -1,193 +0,0 @@ | |||
1 | /* | ||
2 | * zoom2.c -- SoC audio for Zoom2 | ||
3 | * | ||
4 | * Author: Misael Lopez Cruz <x0052729@ti.com> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * version 2 as published by the Free Software Foundation. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, but | ||
11 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | * General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
18 | * 02110-1301 USA | ||
19 | * | ||
20 | */ | ||
21 | |||
22 | #include <linux/clk.h> | ||
23 | #include <linux/platform_device.h> | ||
24 | #include <linux/gpio.h> | ||
25 | #include <sound/core.h> | ||
26 | #include <sound/pcm.h> | ||
27 | #include <sound/soc.h> | ||
28 | |||
29 | #include <asm/mach-types.h> | ||
30 | #include <linux/platform_data/asoc-ti-mcbsp.h> | ||
31 | #include <linux/platform_data/gpio-omap.h> | ||
32 | |||
33 | /* Register descriptions for twl4030 codec part */ | ||
34 | #include <linux/mfd/twl4030-audio.h> | ||
35 | #include <linux/module.h> | ||
36 | |||
37 | #include "omap-mcbsp.h" | ||
38 | #include "omap-pcm.h" | ||
39 | |||
40 | static int zoom2_hw_params(struct snd_pcm_substream *substream, | ||
41 | struct snd_pcm_hw_params *params) | ||
42 | { | ||
43 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
44 | struct snd_soc_dai *codec_dai = rtd->codec_dai; | ||
45 | int ret; | ||
46 | |||
47 | /* Set the codec system clock for DAC and ADC */ | ||
48 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, | ||
49 | SND_SOC_CLOCK_IN); | ||
50 | if (ret < 0) { | ||
51 | printk(KERN_ERR "can't set codec system clock\n"); | ||
52 | return ret; | ||
53 | } | ||
54 | |||
55 | return 0; | ||
56 | } | ||
57 | |||
58 | static struct snd_soc_ops zoom2_ops = { | ||
59 | .hw_params = zoom2_hw_params, | ||
60 | }; | ||
61 | |||
62 | /* Zoom2 machine DAPM */ | ||
63 | static const struct snd_soc_dapm_widget zoom2_twl4030_dapm_widgets[] = { | ||
64 | SND_SOC_DAPM_MIC("Ext Mic", NULL), | ||
65 | SND_SOC_DAPM_SPK("Ext Spk", NULL), | ||
66 | SND_SOC_DAPM_MIC("Headset Mic", NULL), | ||
67 | SND_SOC_DAPM_HP("Headset Stereophone", NULL), | ||
68 | SND_SOC_DAPM_LINE("Aux In", NULL), | ||
69 | }; | ||
70 | |||
71 | static const struct snd_soc_dapm_route audio_map[] = { | ||
72 | /* External Mics: MAINMIC, SUBMIC with bias */ | ||
73 | {"MAINMIC", NULL, "Ext Mic"}, | ||
74 | {"SUBMIC", NULL, "Ext Mic"}, | ||
75 | {"Ext Mic", NULL, "Mic Bias 1"}, | ||
76 | {"Ext Mic", NULL, "Mic Bias 2"}, | ||
77 | |||
78 | /* External Speakers: HFL, HFR */ | ||
79 | {"Ext Spk", NULL, "HFL"}, | ||
80 | {"Ext Spk", NULL, "HFR"}, | ||
81 | |||
82 | /* Headset Stereophone: HSOL, HSOR */ | ||
83 | {"Headset Stereophone", NULL, "HSOL"}, | ||
84 | {"Headset Stereophone", NULL, "HSOR"}, | ||
85 | |||
86 | /* Headset Mic: HSMIC with bias */ | ||
87 | {"HSMIC", NULL, "Headset Mic"}, | ||
88 | {"Headset Mic", NULL, "Headset Mic Bias"}, | ||
89 | |||
90 | /* Aux In: AUXL, AUXR */ | ||
91 | {"Aux In", NULL, "AUXL"}, | ||
92 | {"Aux In", NULL, "AUXR"}, | ||
93 | }; | ||
94 | |||
95 | static int zoom2_twl4030_init(struct snd_soc_pcm_runtime *rtd) | ||
96 | { | ||
97 | struct snd_soc_codec *codec = rtd->codec; | ||
98 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
99 | |||
100 | /* TWL4030 not connected pins */ | ||
101 | snd_soc_dapm_nc_pin(dapm, "CARKITMIC"); | ||
102 | snd_soc_dapm_nc_pin(dapm, "DIGIMIC0"); | ||
103 | snd_soc_dapm_nc_pin(dapm, "DIGIMIC1"); | ||
104 | snd_soc_dapm_nc_pin(dapm, "EARPIECE"); | ||
105 | snd_soc_dapm_nc_pin(dapm, "PREDRIVEL"); | ||
106 | snd_soc_dapm_nc_pin(dapm, "PREDRIVER"); | ||
107 | snd_soc_dapm_nc_pin(dapm, "CARKITL"); | ||
108 | snd_soc_dapm_nc_pin(dapm, "CARKITR"); | ||
109 | |||
110 | return 0; | ||
111 | } | ||
112 | |||
113 | /* Digital audio interface glue - connects codec <--> CPU */ | ||
114 | static struct snd_soc_dai_link zoom2_dai[] = { | ||
115 | { | ||
116 | .name = "TWL4030 I2S", | ||
117 | .stream_name = "TWL4030 Audio", | ||
118 | .cpu_dai_name = "omap-mcbsp.2", | ||
119 | .codec_dai_name = "twl4030-hifi", | ||
120 | .platform_name = "omap-pcm-audio", | ||
121 | .codec_name = "twl4030-codec", | ||
122 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | | ||
123 | SND_SOC_DAIFMT_CBM_CFM, | ||
124 | .init = zoom2_twl4030_init, | ||
125 | .ops = &zoom2_ops, | ||
126 | }, | ||
127 | { | ||
128 | .name = "TWL4030 PCM", | ||
129 | .stream_name = "TWL4030 Voice", | ||
130 | .cpu_dai_name = "omap-mcbsp.3", | ||
131 | .codec_dai_name = "twl4030-voice", | ||
132 | .platform_name = "omap-pcm-audio", | ||
133 | .codec_name = "twl4030-codec", | ||
134 | .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | | ||
135 | SND_SOC_DAIFMT_CBM_CFM, | ||
136 | .ops = &zoom2_ops, | ||
137 | }, | ||
138 | }; | ||
139 | |||
140 | /* Audio machine driver */ | ||
141 | static struct snd_soc_card snd_soc_zoom2 = { | ||
142 | .name = "Zoom2", | ||
143 | .owner = THIS_MODULE, | ||
144 | .dai_link = zoom2_dai, | ||
145 | .num_links = ARRAY_SIZE(zoom2_dai), | ||
146 | |||
147 | .dapm_widgets = zoom2_twl4030_dapm_widgets, | ||
148 | .num_dapm_widgets = ARRAY_SIZE(zoom2_twl4030_dapm_widgets), | ||
149 | .dapm_routes = audio_map, | ||
150 | .num_dapm_routes = ARRAY_SIZE(audio_map), | ||
151 | }; | ||
152 | |||
153 | static struct platform_device *zoom2_snd_device; | ||
154 | |||
155 | static int __init zoom2_soc_init(void) | ||
156 | { | ||
157 | int ret; | ||
158 | |||
159 | if (!machine_is_omap_zoom2()) | ||
160 | return -ENODEV; | ||
161 | printk(KERN_INFO "Zoom2 SoC init\n"); | ||
162 | |||
163 | zoom2_snd_device = platform_device_alloc("soc-audio", -1); | ||
164 | if (!zoom2_snd_device) { | ||
165 | printk(KERN_ERR "Platform device allocation failed\n"); | ||
166 | return -ENOMEM; | ||
167 | } | ||
168 | |||
169 | platform_set_drvdata(zoom2_snd_device, &snd_soc_zoom2); | ||
170 | ret = platform_device_add(zoom2_snd_device); | ||
171 | if (ret) | ||
172 | goto err1; | ||
173 | |||
174 | return 0; | ||
175 | |||
176 | err1: | ||
177 | printk(KERN_ERR "Unable to add platform device\n"); | ||
178 | platform_device_put(zoom2_snd_device); | ||
179 | |||
180 | return ret; | ||
181 | } | ||
182 | module_init(zoom2_soc_init); | ||
183 | |||
184 | static void __exit zoom2_soc_exit(void) | ||
185 | { | ||
186 | platform_device_unregister(zoom2_snd_device); | ||
187 | } | ||
188 | module_exit(zoom2_soc_exit); | ||
189 | |||
190 | MODULE_AUTHOR("Misael Lopez Cruz <x0052729@ti.com>"); | ||
191 | MODULE_DESCRIPTION("ALSA SoC Zoom2"); | ||
192 | MODULE_LICENSE("GPL"); | ||
193 | |||