diff options
Diffstat (limited to 'sound/soc/s3c24xx/neo1973_wm8753.c')
-rw-r--r-- | sound/soc/s3c24xx/neo1973_wm8753.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 906709e6dd5f..0cb4f86f6d1e 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <mach/regs-clock.h> | 29 | #include <mach/regs-clock.h> |
30 | #include <mach/regs-gpio.h> | 30 | #include <mach/regs-gpio.h> |
31 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
32 | #include <plat/audio.h> | ||
33 | #include <linux/io.h> | 32 | #include <linux/io.h> |
34 | #include <mach/spi-gpio.h> | 33 | #include <mach/spi-gpio.h> |
35 | 34 | ||
@@ -37,7 +36,7 @@ | |||
37 | 36 | ||
38 | #include "../codecs/wm8753.h" | 37 | #include "../codecs/wm8753.h" |
39 | #include "lm4857.h" | 38 | #include "lm4857.h" |
40 | #include "s3c24xx-pcm.h" | 39 | #include "s3c-dma.h" |
41 | #include "s3c24xx-i2s.h" | 40 | #include "s3c24xx-i2s.h" |
42 | 41 | ||
43 | /* define the scenarios */ | 42 | /* define the scenarios */ |
@@ -137,7 +136,7 @@ static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream, | |||
137 | return ret; | 136 | return ret; |
138 | 137 | ||
139 | /* codec PLL input is PCLK/4 */ | 138 | /* codec PLL input is PCLK/4 */ |
140 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, | 139 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, |
141 | iis_clkrate / 4, pll_out); | 140 | iis_clkrate / 4, pll_out); |
142 | if (ret < 0) | 141 | if (ret < 0) |
143 | return ret; | 142 | return ret; |
@@ -153,7 +152,7 @@ static int neo1973_hifi_hw_free(struct snd_pcm_substream *substream) | |||
153 | pr_debug("Entered %s\n", __func__); | 152 | pr_debug("Entered %s\n", __func__); |
154 | 153 | ||
155 | /* disable the PLL */ | 154 | /* disable the PLL */ |
156 | return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0); | 155 | return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0, 0); |
157 | } | 156 | } |
158 | 157 | ||
159 | /* | 158 | /* |
@@ -203,7 +202,7 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream, | |||
203 | return ret; | 202 | return ret; |
204 | 203 | ||
205 | /* configue and enable PLL for 12.288MHz output */ | 204 | /* configue and enable PLL for 12.288MHz output */ |
206 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, | 205 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, |
207 | iis_clkrate / 4, 12288000); | 206 | iis_clkrate / 4, 12288000); |
208 | if (ret < 0) | 207 | if (ret < 0) |
209 | return ret; | 208 | return ret; |
@@ -219,7 +218,7 @@ static int neo1973_voice_hw_free(struct snd_pcm_substream *substream) | |||
219 | pr_debug("Entered %s\n", __func__); | 218 | pr_debug("Entered %s\n", __func__); |
220 | 219 | ||
221 | /* disable the PLL */ | 220 | /* disable the PLL */ |
222 | return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0); | 221 | return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0, 0); |
223 | } | 222 | } |
224 | 223 | ||
225 | static struct snd_soc_ops neo1973_voice_ops = { | 224 | static struct snd_soc_ops neo1973_voice_ops = { |