diff options
| author | Arve Hjønnevåg <arve@android.com> | 2011-04-15 21:14:05 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-17 17:54:05 -0800 |
| commit | 01a869655432e964c1651c85a465b463db175286 (patch) | |
| tree | 4f7e81a801ccd4f1931237981d226a729e0e53e6 /sound/soc/samsung/s5p-i2s_sec.c | |
| parent | d6b5d265382e39d707525839fa5fe2c06a28892e (diff) | |
| download | kernel_samsung_aries-01a869655432e964c1651c85a465b463db175286.zip kernel_samsung_aries-01a869655432e964c1651c85a465b463db175286.tar.gz kernel_samsung_aries-01a869655432e964c1651c85a465b463db175286.tar.bz2 | |
ARM: herring: sound: Use audio driver from 2.6.35
fix herring-wm8994.c to compile on 2.6.39
checkpoint: use mainline sound driver
checkout: audio driver loads but locks up
checkpoint: audio setup does not complain, but playback times-out
checkpoint: using soc sound i2s and dma code from 2.6.35 - dma still hangs
checkpoint: using old codec, dma and i2s code sound plays but is distorded
fix distorted sound
rename samsung wm8994 codec to not conflict with standard wm8994 mfd device
modify dma.c to work with dma wrapper
rename some audio config options and fix defconfig
remove some duplicate clocks
Change-Id: I1b72b5b7937fd4a40a1719674976ba16d7e8f3a6
Diffstat (limited to 'sound/soc/samsung/s5p-i2s_sec.c')
| -rw-r--r-- | sound/soc/samsung/s5p-i2s_sec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/samsung/s5p-i2s_sec.c b/sound/soc/samsung/s5p-i2s_sec.c index 59e9115..747dd1c 100644 --- a/sound/soc/samsung/s5p-i2s_sec.c +++ b/sound/soc/samsung/s5p-i2s_sec.c @@ -25,6 +25,7 @@ #include <mach/regs-audss.h> #include <mach/dma.h> #include "s3c-dma.h" +#include "s3c-idma.h" #include "s3c-i2s-v2.h" #define S3C64XX_DIV_BCLK S3C_I2SV2_DIV_BCLK @@ -49,7 +50,7 @@ static struct s3c_dma_params s5p_i2s_sec_pcm_out = { static inline struct s3c_i2sv2_info *to_info(struct snd_soc_dai *cpu_dai) { - return cpu_dai->private_data; + return snd_soc_dai_get_drvdata(cpu_dai); } static void s5p_snd_rxctrl(int on) @@ -226,7 +227,7 @@ int s5p_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; u32 iismod; - snd_soc_dai_set_dma_data(rtd->dai->cpu_dai, + snd_soc_dai_set_dma_data(rtd->cpu_dai, substream, &s5p_i2s_sec_pcm_out); iismod = readl(s5p_i2s0_regs + S3C2412_IISMOD); |