summaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx/jive_wm8750.c
diff options
context:
space:
mode:
authorBen Dooks <ben@simtec.co.uk>2009-03-04 01:49:30 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-06 14:37:08 +0100
commitdc85447b196a683784eb85654c436fd58c3e2ed1 (patch)
treefa4bfa4ddcea242060294ab5db8be598973e31ea /sound/soc/s3c24xx/jive_wm8750.c
parentASoC: Add JIVE audio support (diff)
downloadlinux-dc85447b196a683784eb85654c436fd58c3e2ed1.tar.xz
linux-dc85447b196a683784eb85654c436fd58c3e2ed1.zip
ASoC: Split s3c2412-i2s.c into core and SoC specific parts
The S3C2412 I2S (IIS) interface is replicated on further Samsung SoC parts in a broadly compatible way, so split the common code out into a core called s3c-i2s-v2.[ch] so that the newer SoCs such as the S3C6410 can make use of it. As such, all the original s3c2412 functions are currently being left with their original names, and will be renamed later in the series. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/jive_wm8750.c')
-rw-r--r--sound/soc/s3c24xx/jive_wm8750.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c
index fe466c1f71ec..7dfe26ea8f40 100644
--- a/sound/soc/s3c24xx/jive_wm8750.c
+++ b/sound/soc/s3c24xx/jive_wm8750.c
@@ -65,7 +65,7 @@ static int jive_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
- struct s3c2412_rate_calc div;
+ struct s3c_i2sv2_rate_calc div;
unsigned int clk = 0;
int ret = 0;
@@ -83,8 +83,8 @@ static int jive_hw_params(struct snd_pcm_substream *substream,
break;
}
- s3c2412_iis_calc_rate(&div, NULL, params_rate(params),
- s3c2412_get_iisclk());
+ s3c_i2sv2_calc_rate(&div, NULL, params_rate(params),
+ s3c2412_get_iisclk());
/* set codec DAI configuration */
ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |