diff options
| author | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
| commit | 1ad1f10cd915744bbe52b19423653b38287d827d (patch) | |
| tree | ae072aace36b45a55d80b8cbf1b6d92523a88ea0 /sound/soc/s3c24xx/neo1973_wm8753.c | |
| parent | 08e3daff217059c84c360cc71212686e0a7995af (diff) | |
| parent | 2b876f95d03e226394b5d360c86127cbefaf614b (diff) | |
| download | op-kernel-dev-1ad1f10cd915744bbe52b19423653b38287d827d.zip op-kernel-dev-1ad1f10cd915744bbe52b19423653b38287d827d.tar.gz | |
Merge branch 'master' into next
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 906709e..0cb4f86 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -29,7 +29,6 @@ #include <mach/regs-clock.h> #include <mach/regs-gpio.h> #include <mach/hardware.h> -#include <plat/audio.h> #include <linux/io.h> #include <mach/spi-gpio.h> @@ -37,7 +36,7 @@ #include "../codecs/wm8753.h" #include "lm4857.h" -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-i2s.h" /* define the scenarios */ @@ -137,7 +136,7 @@ static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream, return ret; /* codec PLL input is PCLK/4 */ - ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, + ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, iis_clkrate / 4, pll_out); if (ret < 0) return ret; @@ -153,7 +152,7 @@ static int neo1973_hifi_hw_free(struct snd_pcm_substream *substream) pr_debug("Entered %s\n", __func__); /* disable the PLL */ - return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0); + return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0, 0); } /* @@ -203,7 +202,7 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream, return ret; /* configue and enable PLL for 12.288MHz output */ - ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, + ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, iis_clkrate / 4, 12288000); if (ret < 0) return ret; @@ -219,7 +218,7 @@ static int neo1973_voice_hw_free(struct snd_pcm_substream *substream) pr_debug("Entered %s\n", __func__); /* disable the PLL */ - return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0); + return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0, 0); } static struct snd_soc_ops neo1973_voice_ops = { |
