diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2009-11-17 02:53:23 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-18 08:35:03 -0500 |
commit | faa31776e4c799d631d8cd3a13dd50cd95b0875e (patch) | |
tree | b8f498d292688f0fe78974a21d29189a9084aaf7 /sound/soc/s3c24xx/s3c2443-ac97.c | |
parent | 8df89bc35c188e389295eaf7917653f13c83ce70 (diff) |
ASoC: Rename s3c24xx_pcm prefix to s3c_dma
The s3c24xx_pcm prefix for the soc_platform is inappropriate when
some Samsung SoCs have PCM controllers which will eventually have
drivers and hence namespace ambiguities.
To resolve naming ambiguities in future the following have been
renamed in order
1) s3c24xx_pcm_dma_params -> s3c_dma_params
2) s3c24xx_pcm_preallocate_dma_buffer -> s3c_preallocate_dma_buffer
3) s3c24xx_pcm_dmamask -> s3c_dma_mask
4) s3c24xx_pcm_XXX -> s3c_dma_XXX
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/s3c2443-ac97.c')
-rw-r--r-- | sound/soc/s3c24xx/s3c2443-ac97.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index b25e9f968df9..678b1763160b 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c | |||
@@ -188,21 +188,21 @@ static struct s3c2410_dma_client s3c2443_dma_client_micin = { | |||
188 | .name = "AC97 Mic Mono in" | 188 | .name = "AC97 Mic Mono in" |
189 | }; | 189 | }; |
190 | 190 | ||
191 | static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_out = { | 191 | static struct s3c_dma_params s3c2443_ac97_pcm_stereo_out = { |
192 | .client = &s3c2443_dma_client_out, | 192 | .client = &s3c2443_dma_client_out, |
193 | .channel = DMACH_PCM_OUT, | 193 | .channel = DMACH_PCM_OUT, |
194 | .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, | 194 | .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, |
195 | .dma_size = 4, | 195 | .dma_size = 4, |
196 | }; | 196 | }; |
197 | 197 | ||
198 | static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_in = { | 198 | static struct s3c_dma_params s3c2443_ac97_pcm_stereo_in = { |
199 | .client = &s3c2443_dma_client_in, | 199 | .client = &s3c2443_dma_client_in, |
200 | .channel = DMACH_PCM_IN, | 200 | .channel = DMACH_PCM_IN, |
201 | .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, | 201 | .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, |
202 | .dma_size = 4, | 202 | .dma_size = 4, |
203 | }; | 203 | }; |
204 | 204 | ||
205 | static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = { | 205 | static struct s3c_dma_params s3c2443_ac97_mic_mono_in = { |
206 | .client = &s3c2443_dma_client_micin, | 206 | .client = &s3c2443_dma_client_micin, |
207 | .channel = DMACH_MIC_IN, | 207 | .channel = DMACH_MIC_IN, |
208 | .dma_addr = S3C2440_PA_AC97 + S3C_AC97_MIC_DATA, | 208 | .dma_addr = S3C2440_PA_AC97 + S3C_AC97_MIC_DATA, |
@@ -290,7 +290,7 @@ static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd, | |||
290 | { | 290 | { |
291 | u32 ac_glbctrl; | 291 | u32 ac_glbctrl; |
292 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 292 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
293 | int channel = ((struct s3c24xx_pcm_dma_params *) | 293 | int channel = ((struct s3c_dma_params *) |
294 | rtd->dai->cpu_dai->dma_data)->channel; | 294 | rtd->dai->cpu_dai->dma_data)->channel; |
295 | 295 | ||
296 | ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); | 296 | ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); |
@@ -339,7 +339,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream, | |||
339 | { | 339 | { |
340 | u32 ac_glbctrl; | 340 | u32 ac_glbctrl; |
341 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 341 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
342 | int channel = ((struct s3c24xx_pcm_dma_params *) | 342 | int channel = ((struct s3c_dma_params *) |
343 | rtd->dai->cpu_dai->dma_data)->channel; | 343 | rtd->dai->cpu_dai->dma_data)->channel; |
344 | 344 | ||
345 | ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); | 345 | ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); |