diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2010-11-22 01:37:13 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-23 09:07:46 -0500 |
commit | 03e6a88897f923ae2608569e66afba4766e1abf7 (patch) | |
tree | dce7d6e2b9727395226456e80b1d03ba332bf05c /sound/soc/s3c24xx | |
parent | 0fff21a86c1ada9e9eba0d11fb91797bf2c73d46 (diff) |
ASoC: S3C64XX: Remove obsoleted I2S drivers
Now that we have better I2S CPU drivers and no need for the old
ones, discard them.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx')
-rw-r--r-- | sound/soc/s3c24xx/Kconfig | 10 | ||||
-rw-r--r-- | sound/soc/s3c24xx/Makefile | 4 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s.c | 242 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s.h | 41 |
5 files changed, 0 insertions, 527 deletions
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index 597626389e81..15f5f9103a0c 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig | |||
@@ -20,16 +20,6 @@ config SND_S3C2412_SOC_I2S | |||
20 | select SND_S3C_I2SV2_SOC | 20 | select SND_S3C_I2SV2_SOC |
21 | select S3C2410_DMA | 21 | select S3C2410_DMA |
22 | 22 | ||
23 | config SND_S3C64XX_SOC_I2S | ||
24 | tristate | ||
25 | select SND_S3C_I2SV2_SOC | ||
26 | select S3C64XX_DMA | ||
27 | |||
28 | config SND_S3C64XX_SOC_I2S_V4 | ||
29 | tristate | ||
30 | select SND_S3C_I2SV2_SOC | ||
31 | select S3C64XX_DMA | ||
32 | |||
33 | config SND_S3C_SOC_PCM | 23 | config SND_S3C_SOC_PCM |
34 | tristate | 24 | tristate |
35 | 25 | ||
diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile index 1d6fc0736102..dac41eefafc4 100644 --- a/sound/soc/s3c24xx/Makefile +++ b/sound/soc/s3c24xx/Makefile | |||
@@ -2,9 +2,7 @@ | |||
2 | snd-soc-s3c24xx-objs := dma.o | 2 | snd-soc-s3c24xx-objs := dma.o |
3 | snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o | 3 | snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o |
4 | snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o | 4 | snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o |
5 | snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o | ||
6 | snd-soc-ac97-objs := ac97.o | 5 | snd-soc-ac97-objs := ac97.o |
7 | snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o | ||
8 | snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o | 6 | snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o |
9 | snd-soc-samsung-spdif-objs := spdif.o | 7 | snd-soc-samsung-spdif-objs := spdif.o |
10 | snd-soc-pcm-objs := pcm.o | 8 | snd-soc-pcm-objs := pcm.o |
@@ -14,8 +12,6 @@ obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o | |||
14 | obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o | 12 | obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o |
15 | obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-ac97.o | 13 | obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-ac97.o |
16 | obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o | 14 | obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o |
17 | obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += snd-soc-s3c64xx-i2s.o | ||
18 | obj-$(CONFIG_SND_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o | ||
19 | obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o | 15 | obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o |
20 | obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o | 16 | obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o |
21 | obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o | 17 | obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o |
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c deleted file mode 100644 index 8a080416ce85..000000000000 --- a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c +++ /dev/null | |||
@@ -1,230 +0,0 @@ | |||
1 | /* sound/soc/s3c24xx/s3c64xx-i2s-v4.c | ||
2 | * | ||
3 | * ALSA SoC Audio Layer - S3C64XX I2Sv4 driver | ||
4 | * Copyright (c) 2010 Samsung Electronics Co. Ltd | ||
5 | * Author: Jaswinder Singh <jassi.brar@samsung.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #include <linux/clk.h> | ||
13 | #include <linux/gpio.h> | ||
14 | #include <linux/io.h> | ||
15 | |||
16 | #include <sound/soc.h> | ||
17 | #include <sound/pcm_params.h> | ||
18 | |||
19 | #include <plat/audio.h> | ||
20 | |||
21 | #include <mach/map.h> | ||
22 | #include <mach/dma.h> | ||
23 | |||
24 | #include "dma.h" | ||
25 | #include "regs-i2s-v2.h" | ||
26 | #include "s3c64xx-i2s.h" | ||
27 | |||
28 | static struct s3c2410_dma_client s3c64xx_dma_client_out = { | ||
29 | .name = "I2Sv4 PCM Stereo out" | ||
30 | }; | ||
31 | |||
32 | static struct s3c2410_dma_client s3c64xx_dma_client_in = { | ||
33 | .name = "I2Sv4 PCM Stereo in" | ||
34 | }; | ||
35 | |||
36 | static struct s3c_dma_params s3c64xx_i2sv4_pcm_stereo_out; | ||
37 | static struct s3c_dma_params s3c64xx_i2sv4_pcm_stereo_in; | ||
38 | static struct s3c_i2sv2_info s3c64xx_i2sv4; | ||
39 | |||
40 | static int s3c64xx_i2sv4_probe(struct snd_soc_dai *dai) | ||
41 | { | ||
42 | struct s3c_i2sv2_info *i2s = &s3c64xx_i2sv4; | ||
43 | int ret = 0; | ||
44 | |||
45 | snd_soc_dai_set_drvdata(dai, i2s); | ||
46 | |||
47 | ret = s3c_i2sv2_probe(dai, i2s, i2s->base); | ||
48 | |||
49 | return ret; | ||
50 | } | ||
51 | |||
52 | static int s3c_i2sv4_hw_params(struct snd_pcm_substream *substream, | ||
53 | struct snd_pcm_hw_params *params, | ||
54 | struct snd_soc_dai *cpu_dai) | ||
55 | { | ||
56 | struct s3c_i2sv2_info *i2s = snd_soc_dai_get_drvdata(cpu_dai); | ||
57 | struct s3c_dma_params *dma_data; | ||
58 | u32 iismod; | ||
59 | |||
60 | dev_dbg(cpu_dai->dev, "Entered %s\n", __func__); | ||
61 | |||
62 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
63 | dma_data = i2s->dma_playback; | ||
64 | else | ||
65 | dma_data = i2s->dma_capture; | ||
66 | |||
67 | snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data); | ||
68 | |||
69 | iismod = readl(i2s->regs + S3C2412_IISMOD); | ||
70 | dev_dbg(cpu_dai->dev, "%s: r: IISMOD: %x\n", __func__, iismod); | ||
71 | |||
72 | iismod &= ~S3C64XX_IISMOD_BLC_MASK; | ||
73 | switch (params_format(params)) { | ||
74 | case SNDRV_PCM_FORMAT_S8: | ||
75 | iismod |= S3C64XX_IISMOD_BLC_8BIT; | ||
76 | break; | ||
77 | case SNDRV_PCM_FORMAT_S16_LE: | ||
78 | break; | ||
79 | case SNDRV_PCM_FORMAT_S24_LE: | ||
80 | iismod |= S3C64XX_IISMOD_BLC_24BIT; | ||
81 | break; | ||
82 | } | ||
83 | |||
84 | writel(iismod, i2s->regs + S3C2412_IISMOD); | ||
85 | dev_dbg(cpu_dai->dev, "%s: w: IISMOD: %x\n", __func__, iismod); | ||
86 | |||
87 | return 0; | ||
88 | } | ||
89 | |||
90 | static struct snd_soc_dai_ops s3c64xx_i2sv4_dai_ops = { | ||
91 | .hw_params = s3c_i2sv4_hw_params, | ||
92 | }; | ||
93 | |||
94 | static struct snd_soc_dai_driver s3c64xx_i2s_v4_dai = { | ||
95 | .symmetric_rates = 1, | ||
96 | .playback = { | ||
97 | .channels_min = 2, | ||
98 | .channels_max = 2, | ||
99 | .rates = S3C64XX_I2S_RATES, | ||
100 | .formats = S3C64XX_I2S_FMTS, | ||
101 | }, | ||
102 | .capture = { | ||
103 | .channels_min = 2, | ||
104 | .channels_max = 2, | ||
105 | .rates = S3C64XX_I2S_RATES, | ||
106 | .formats = S3C64XX_I2S_FMTS, | ||
107 | }, | ||
108 | .probe = s3c64xx_i2sv4_probe, | ||
109 | .ops = &s3c64xx_i2sv4_dai_ops, | ||
110 | }; | ||
111 | |||
112 | static __devinit int s3c64xx_i2sv4_dev_probe(struct platform_device *pdev) | ||
113 | { | ||
114 | struct s3c_audio_pdata *i2s_pdata; | ||
115 | struct s3c_i2sv2_info *i2s; | ||
116 | struct resource *res; | ||
117 | int ret; | ||
118 | |||
119 | i2s = &s3c64xx_i2sv4; | ||
120 | |||
121 | i2s->feature |= S3C_FEATURE_CDCLKCON; | ||
122 | |||
123 | i2s->dma_capture = &s3c64xx_i2sv4_pcm_stereo_in; | ||
124 | i2s->dma_playback = &s3c64xx_i2sv4_pcm_stereo_out; | ||
125 | |||
126 | res = platform_get_resource(pdev, IORESOURCE_DMA, 0); | ||
127 | if (!res) { | ||
128 | dev_err(&pdev->dev, "Unable to get I2S-TX dma resource\n"); | ||
129 | return -ENXIO; | ||
130 | } | ||
131 | i2s->dma_playback->channel = res->start; | ||
132 | |||
133 | res = platform_get_resource(pdev, IORESOURCE_DMA, 1); | ||
134 | if (!res) { | ||
135 | dev_err(&pdev->dev, "Unable to get I2S-RX dma resource\n"); | ||
136 | return -ENXIO; | ||
137 | } | ||
138 | i2s->dma_capture->channel = res->start; | ||
139 | |||
140 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
141 | if (!res) { | ||
142 | dev_err(&pdev->dev, "Unable to get I2S SFR address\n"); | ||
143 | return -ENXIO; | ||
144 | } | ||
145 | |||
146 | if (!request_mem_region(res->start, resource_size(res), | ||
147 | "s3c64xx-i2s-v4")) { | ||
148 | dev_err(&pdev->dev, "Unable to request SFR region\n"); | ||
149 | return -EBUSY; | ||
150 | } | ||
151 | i2s->dma_capture->dma_addr = res->start + S3C2412_IISRXD; | ||
152 | i2s->dma_playback->dma_addr = res->start + S3C2412_IISTXD; | ||
153 | |||
154 | i2s->dma_capture->client = &s3c64xx_dma_client_in; | ||
155 | i2s->dma_capture->dma_size = 4; | ||
156 | i2s->dma_playback->client = &s3c64xx_dma_client_out; | ||
157 | i2s->dma_playback->dma_size = 4; | ||
158 | |||
159 | i2s->base = res->start; | ||
160 | |||
161 | i2s_pdata = pdev->dev.platform_data; | ||
162 | if (i2s_pdata && i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) { | ||
163 | dev_err(&pdev->dev, "Unable to configure gpio\n"); | ||
164 | return -EINVAL; | ||
165 | } | ||
166 | |||
167 | i2s->iis_cclk = clk_get(&pdev->dev, "audio-bus"); | ||
168 | if (IS_ERR(i2s->iis_cclk)) { | ||
169 | dev_err(&pdev->dev, "failed to get audio-bus\n"); | ||
170 | ret = PTR_ERR(i2s->iis_cclk); | ||
171 | goto err; | ||
172 | } | ||
173 | |||
174 | clk_enable(i2s->iis_cclk); | ||
175 | |||
176 | ret = s3c_i2sv2_register_dai(&pdev->dev, pdev->id, &s3c64xx_i2s_v4_dai); | ||
177 | if (ret != 0) | ||
178 | goto err_i2sv2; | ||
179 | |||
180 | return 0; | ||
181 | |||
182 | err_i2sv2: | ||
183 | clk_put(i2s->iis_cclk); | ||
184 | err: | ||
185 | return ret; | ||
186 | } | ||
187 | |||
188 | static __devexit int s3c64xx_i2sv4_dev_remove(struct platform_device *pdev) | ||
189 | { | ||
190 | struct s3c_i2sv2_info *i2s = &s3c64xx_i2sv4; | ||
191 | struct resource *res; | ||
192 | |||
193 | snd_soc_unregister_dai(&pdev->dev); | ||
194 | clk_put(i2s->iis_cclk); | ||
195 | |||
196 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
197 | if (res) | ||
198 | release_mem_region(res->start, resource_size(res)); | ||
199 | else | ||
200 | dev_warn(&pdev->dev, "Unable to get I2S SFR address\n"); | ||
201 | |||
202 | return 0; | ||
203 | } | ||
204 | |||
205 | static struct platform_driver s3c64xx_i2sv4_driver = { | ||
206 | .probe = s3c64xx_i2sv4_dev_probe, | ||
207 | .remove = s3c64xx_i2sv4_dev_remove, | ||
208 | .driver = { | ||
209 | .name = "samsung-i2s-v4", | ||
210 | .owner = THIS_MODULE, | ||
211 | }, | ||
212 | }; | ||
213 | |||
214 | static int __init s3c64xx_i2sv4_init(void) | ||
215 | { | ||
216 | return platform_driver_register(&s3c64xx_i2sv4_driver); | ||
217 | } | ||
218 | module_init(s3c64xx_i2sv4_init); | ||
219 | |||
220 | static void __exit s3c64xx_i2sv4_exit(void) | ||
221 | { | ||
222 | platform_driver_unregister(&s3c64xx_i2sv4_driver); | ||
223 | } | ||
224 | module_exit(s3c64xx_i2sv4_exit); | ||
225 | |||
226 | /* Module information */ | ||
227 | MODULE_AUTHOR("Jaswinder Singh, <jassi.brar@samsung.com>"); | ||
228 | MODULE_DESCRIPTION("S3C64XX I2Sv4 SoC Interface"); | ||
229 | MODULE_LICENSE("GPL"); | ||
230 | MODULE_ALIAS("platform:samsung-i2s-v4"); | ||
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c deleted file mode 100644 index 0fefbb545947..000000000000 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ /dev/null | |||
@@ -1,242 +0,0 @@ | |||
1 | /* sound/soc/s3c24xx/s3c64xx-i2s.c | ||
2 | * | ||
3 | * ALSA SoC Audio Layer - S3C64XX I2S driver | ||
4 | * | ||
5 | * Copyright 2008 Openmoko, Inc. | ||
6 | * Copyright 2008 Simtec Electronics | ||
7 | * Ben Dooks <ben@simtec.co.uk> | ||
8 | * http://armlinux.simtec.co.uk/ | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #include <linux/module.h> | ||
16 | #include <linux/clk.h> | ||
17 | #include <linux/gpio.h> | ||
18 | #include <linux/io.h> | ||
19 | #include <linux/slab.h> | ||
20 | |||
21 | #include <sound/soc.h> | ||
22 | |||
23 | #include <plat/audio.h> | ||
24 | |||
25 | #include <mach/map.h> | ||
26 | #include <mach/dma.h> | ||
27 | |||
28 | #include "dma.h" | ||
29 | #include "regs-i2s-v2.h" | ||
30 | #include "s3c64xx-i2s.h" | ||
31 | |||
32 | /* The value should be set to maximum of the total number | ||
33 | * of I2Sv3 controllers that any supported SoC has. | ||
34 | */ | ||
35 | #define MAX_I2SV3 2 | ||
36 | |||
37 | static struct s3c2410_dma_client s3c64xx_dma_client_out = { | ||
38 | .name = "I2S PCM Stereo out" | ||
39 | }; | ||
40 | |||
41 | static struct s3c2410_dma_client s3c64xx_dma_client_in = { | ||
42 | .name = "I2S PCM Stereo in" | ||
43 | }; | ||
44 | |||
45 | static struct s3c_dma_params s3c64xx_i2s_pcm_stereo_out[MAX_I2SV3]; | ||
46 | static struct s3c_dma_params s3c64xx_i2s_pcm_stereo_in[MAX_I2SV3]; | ||
47 | static struct s3c_i2sv2_info s3c64xx_i2s[MAX_I2SV3]; | ||
48 | |||
49 | struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai) | ||
50 | { | ||
51 | struct s3c_i2sv2_info *i2s = snd_soc_dai_get_drvdata(dai); | ||
52 | u32 iismod = readl(i2s->regs + S3C2412_IISMOD); | ||
53 | |||
54 | if (iismod & S3C2412_IISMOD_IMS_SYSMUX) | ||
55 | return i2s->iis_cclk; | ||
56 | else | ||
57 | return i2s->iis_pclk; | ||
58 | } | ||
59 | EXPORT_SYMBOL_GPL(s3c64xx_i2s_get_clock); | ||
60 | |||
61 | static int s3c64xx_i2s_probe(struct snd_soc_dai *dai) | ||
62 | { | ||
63 | struct s3c_i2sv2_info *i2s; | ||
64 | int ret; | ||
65 | |||
66 | if (dai->id >= MAX_I2SV3) { | ||
67 | dev_err(dai->dev, "id %d out of range\n", dai->id); | ||
68 | return -EINVAL; | ||
69 | } | ||
70 | |||
71 | i2s = &s3c64xx_i2s[dai->id]; | ||
72 | snd_soc_dai_set_drvdata(dai, i2s); | ||
73 | |||
74 | i2s->iis_cclk = clk_get(dai->dev, "audio-bus"); | ||
75 | if (IS_ERR(i2s->iis_cclk)) { | ||
76 | dev_err(dai->dev, "failed to get audio-bus\n"); | ||
77 | ret = PTR_ERR(i2s->iis_cclk); | ||
78 | goto err; | ||
79 | } | ||
80 | |||
81 | clk_enable(i2s->iis_cclk); | ||
82 | |||
83 | ret = s3c_i2sv2_probe(dai, i2s, i2s->base); | ||
84 | if (ret) | ||
85 | goto err_clk; | ||
86 | |||
87 | return 0; | ||
88 | |||
89 | err_clk: | ||
90 | clk_disable(i2s->iis_cclk); | ||
91 | clk_put(i2s->iis_cclk); | ||
92 | err: | ||
93 | kfree(i2s); | ||
94 | return ret; | ||
95 | } | ||
96 | |||
97 | static int s3c64xx_i2s_remove(struct snd_soc_dai *dai) | ||
98 | { | ||
99 | struct s3c_i2sv2_info *i2s = snd_soc_dai_get_drvdata(dai); | ||
100 | |||
101 | clk_disable(i2s->iis_cclk); | ||
102 | clk_put(i2s->iis_cclk); | ||
103 | kfree(i2s); | ||
104 | return 0; | ||
105 | } | ||
106 | |||
107 | static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops; | ||
108 | |||
109 | static struct snd_soc_dai_driver s3c64xx_i2s_dai[MAX_I2SV3] = { | ||
110 | { | ||
111 | .name = "s3c64xx-i2s-0", | ||
112 | .probe = s3c64xx_i2s_probe, | ||
113 | .remove = s3c64xx_i2s_remove, | ||
114 | .playback = { | ||
115 | .channels_min = 2, | ||
116 | .channels_max = 2, | ||
117 | .rates = S3C64XX_I2S_RATES, | ||
118 | .formats = S3C64XX_I2S_FMTS,}, | ||
119 | .capture = { | ||
120 | .channels_min = 2, | ||
121 | .channels_max = 2, | ||
122 | .rates = S3C64XX_I2S_RATES, | ||
123 | .formats = S3C64XX_I2S_FMTS,}, | ||
124 | .ops = &s3c64xx_i2s_dai_ops, | ||
125 | .symmetric_rates = 1, | ||
126 | }, { | ||
127 | .name = "s3c64xx-i2s-1", | ||
128 | .probe = s3c64xx_i2s_probe, | ||
129 | .remove = s3c64xx_i2s_remove, | ||
130 | .playback = { | ||
131 | .channels_min = 2, | ||
132 | .channels_max = 2, | ||
133 | .rates = S3C64XX_I2S_RATES, | ||
134 | .formats = S3C64XX_I2S_FMTS,}, | ||
135 | .capture = { | ||
136 | .channels_min = 2, | ||
137 | .channels_max = 2, | ||
138 | .rates = S3C64XX_I2S_RATES, | ||
139 | .formats = S3C64XX_I2S_FMTS,}, | ||
140 | .ops = &s3c64xx_i2s_dai_ops, | ||
141 | .symmetric_rates = 1, | ||
142 | },}; | ||
143 | |||
144 | static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev) | ||
145 | { | ||
146 | struct s3c_audio_pdata *i2s_pdata; | ||
147 | struct s3c_i2sv2_info *i2s; | ||
148 | struct resource *res; | ||
149 | int i, ret; | ||
150 | |||
151 | if (pdev->id >= MAX_I2SV3) { | ||
152 | dev_err(&pdev->dev, "id %d out of range\n", pdev->id); | ||
153 | return -EINVAL; | ||
154 | } | ||
155 | |||
156 | i2s = &s3c64xx_i2s[pdev->id]; | ||
157 | |||
158 | i2s->dma_capture = &s3c64xx_i2s_pcm_stereo_in[pdev->id]; | ||
159 | i2s->dma_playback = &s3c64xx_i2s_pcm_stereo_out[pdev->id]; | ||
160 | |||
161 | res = platform_get_resource(pdev, IORESOURCE_DMA, 0); | ||
162 | if (!res) { | ||
163 | dev_err(&pdev->dev, "Unable to get I2S-TX dma resource\n"); | ||
164 | return -ENXIO; | ||
165 | } | ||
166 | i2s->dma_playback->channel = res->start; | ||
167 | |||
168 | res = platform_get_resource(pdev, IORESOURCE_DMA, 1); | ||
169 | if (!res) { | ||
170 | dev_err(&pdev->dev, "Unable to get I2S-RX dma resource\n"); | ||
171 | return -ENXIO; | ||
172 | } | ||
173 | i2s->dma_capture->channel = res->start; | ||
174 | |||
175 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
176 | if (!res) { | ||
177 | dev_err(&pdev->dev, "Unable to get I2S SFR address\n"); | ||
178 | return -ENXIO; | ||
179 | } | ||
180 | |||
181 | if (!request_mem_region(res->start, resource_size(res), | ||
182 | "s3c64xx-i2s")) { | ||
183 | dev_err(&pdev->dev, "Unable to request SFR region\n"); | ||
184 | return -EBUSY; | ||
185 | } | ||
186 | i2s->base = res->start; | ||
187 | |||
188 | i2s_pdata = pdev->dev.platform_data; | ||
189 | if (i2s_pdata && i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) { | ||
190 | dev_err(&pdev->dev, "Unable to configure gpio\n"); | ||
191 | return -EINVAL; | ||
192 | } | ||
193 | i2s->dma_capture->dma_addr = res->start + S3C2412_IISRXD; | ||
194 | i2s->dma_playback->dma_addr = res->start + S3C2412_IISTXD; | ||
195 | |||
196 | i2s->dma_capture->client = &s3c64xx_dma_client_in; | ||
197 | i2s->dma_capture->dma_size = 4; | ||
198 | i2s->dma_playback->client = &s3c64xx_dma_client_out; | ||
199 | i2s->dma_playback->dma_size = 4; | ||
200 | |||
201 | for (i = 0; i < ARRAY_SIZE(s3c64xx_i2s_dai); i++) { | ||
202 | ret = s3c_i2sv2_register_dai(&pdev->dev, i, | ||
203 | &s3c64xx_i2s_dai[i]); | ||
204 | if (ret != 0) | ||
205 | return ret; | ||
206 | } | ||
207 | |||
208 | return 0; | ||
209 | } | ||
210 | |||
211 | static __devexit int s3c64xx_iis_dev_remove(struct platform_device *pdev) | ||
212 | { | ||
213 | snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c64xx_i2s_dai)); | ||
214 | return 0; | ||
215 | } | ||
216 | |||
217 | static struct platform_driver s3c64xx_iis_driver = { | ||
218 | .probe = s3c64xx_iis_dev_probe, | ||
219 | .remove = s3c64xx_iis_dev_remove, | ||
220 | .driver = { | ||
221 | .name = "samsung-i2s", | ||
222 | .owner = THIS_MODULE, | ||
223 | }, | ||
224 | }; | ||
225 | |||
226 | static int __init s3c64xx_i2s_init(void) | ||
227 | { | ||
228 | return platform_driver_register(&s3c64xx_iis_driver); | ||
229 | } | ||
230 | module_init(s3c64xx_i2s_init); | ||
231 | |||
232 | static void __exit s3c64xx_i2s_exit(void) | ||
233 | { | ||
234 | platform_driver_unregister(&s3c64xx_iis_driver); | ||
235 | } | ||
236 | module_exit(s3c64xx_i2s_exit); | ||
237 | |||
238 | /* Module information */ | ||
239 | MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>"); | ||
240 | MODULE_DESCRIPTION("S3C64XX I2S SoC Interface"); | ||
241 | MODULE_LICENSE("GPL"); | ||
242 | MODULE_ALIAS("platform:samsung-i2s"); | ||
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.h b/sound/soc/s3c24xx/s3c64xx-i2s.h deleted file mode 100644 index de4075d26f0c..000000000000 --- a/sound/soc/s3c24xx/s3c64xx-i2s.h +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | /* sound/soc/s3c24xx/s3c64xx-i2s.h | ||
2 | * | ||
3 | * ALSA SoC Audio Layer - S3C64XX I2S driver | ||
4 | * | ||
5 | * Copyright 2008 Openmoko, Inc. | ||
6 | * Copyright 2008 Simtec Electronics | ||
7 | * Ben Dooks <ben@simtec.co.uk> | ||
8 | * http://armlinux.simtec.co.uk/ | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #ifndef __SND_SOC_S3C24XX_S3C64XX_I2S_H | ||
16 | #define __SND_SOC_S3C24XX_S3C64XX_I2S_H __FILE__ | ||
17 | |||
18 | struct clk; | ||
19 | |||
20 | #include "s3c-i2s-v2.h" | ||
21 | |||
22 | #define S3C64XX_DIV_BCLK S3C_I2SV2_DIV_BCLK | ||
23 | #define S3C64XX_DIV_RCLK S3C_I2SV2_DIV_RCLK | ||
24 | #define S3C64XX_DIV_PRESCALER S3C_I2SV2_DIV_PRESCALER | ||
25 | |||
26 | #define S3C64XX_CLKSRC_PCLK S3C_I2SV2_CLKSRC_PCLK | ||
27 | #define S3C64XX_CLKSRC_MUX S3C_I2SV2_CLKSRC_AUDIOBUS | ||
28 | #define S3C64XX_CLKSRC_CDCLK S3C_I2SV2_CLKSRC_CDCLK | ||
29 | |||
30 | #define S3C64XX_I2S_RATES \ | ||
31 | (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \ | ||
32 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ | ||
33 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) | ||
34 | |||
35 | #define S3C64XX_I2S_FMTS \ | ||
36 | (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\ | ||
37 | SNDRV_PCM_FMTBIT_S24_LE) | ||
38 | |||
39 | struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai); | ||
40 | |||
41 | #endif /* __SND_SOC_S3C24XX_S3C64XX_I2S_H */ | ||