diff options
-rw-r--r-- | sound/soc/s3c24xx/Kconfig | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/goni_wm8994.c | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index 3b9736bd7a7e..749f630475eb 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig | |||
@@ -151,7 +151,7 @@ config SND_S3C64XX_SOC_SMARTQ | |||
151 | config SND_SOC_GONI_AQUILA_WM8994 | 151 | config SND_SOC_GONI_AQUILA_WM8994 |
152 | tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" | 152 | tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" |
153 | depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA) | 153 | depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA) |
154 | select SND_S3C64XX_SOC_I2S_V4 | 154 | select SND_SAMSUNG_I2S |
155 | select SND_SOC_WM8994 | 155 | select SND_SOC_WM8994 |
156 | help | 156 | help |
157 | Say Y if you want to add support for SoC audio on goni or aquila | 157 | Say Y if you want to add support for SoC audio on goni or aquila |
diff --git a/sound/soc/s3c24xx/goni_wm8994.c b/sound/soc/s3c24xx/goni_wm8994.c index 0badcc56e93c..dcfac546cb81 100644 --- a/sound/soc/s3c24xx/goni_wm8994.c +++ b/sound/soc/s3c24xx/goni_wm8994.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/mfd/wm8994/registers.h> | 25 | #include <linux/mfd/wm8994/registers.h> |
26 | #include "../codecs/wm8994.h" | 26 | #include "../codecs/wm8994.h" |
27 | #include "dma.h" | 27 | #include "dma.h" |
28 | #include "s3c64xx-i2s.h" | 28 | #include "i2s.h" |
29 | 29 | ||
30 | #define MACHINE_NAME 0 | 30 | #define MACHINE_NAME 0 |
31 | #define CPU_VOICE_DAI 1 | 31 | #define CPU_VOICE_DAI 1 |
@@ -163,12 +163,6 @@ static int goni_hifi_hw_params(struct snd_pcm_substream *substream, | |||
163 | if (ret < 0) | 163 | if (ret < 0) |
164 | return ret; | 164 | return ret; |
165 | 165 | ||
166 | /* set the cpu system clock */ | ||
167 | ret = snd_soc_dai_set_sysclk(cpu_dai, S3C64XX_CLKSRC_PCLK, | ||
168 | 0, SND_SOC_CLOCK_IN); | ||
169 | if (ret < 0) | ||
170 | return ret; | ||
171 | |||
172 | /* set codec DAI configuration */ | 166 | /* set codec DAI configuration */ |
173 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | 167 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | |
174 | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); | 168 | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); |
@@ -249,7 +243,7 @@ static struct snd_soc_dai_link goni_dai[] = { | |||
249 | { | 243 | { |
250 | .name = "WM8994", | 244 | .name = "WM8994", |
251 | .stream_name = "WM8994 HiFi", | 245 | .stream_name = "WM8994 HiFi", |
252 | .cpu_dai_name = "s3c64xx-i2s-v4", | 246 | .cpu_dai_name = "samsung-i2s.0", |
253 | .codec_dai_name = "wm8994-hifi", | 247 | .codec_dai_name = "wm8994-hifi", |
254 | .platform_name = "samsung-audio", | 248 | .platform_name = "samsung-audio", |
255 | .codec_name = "wm8994-codec.0-0x1a", | 249 | .codec_name = "wm8994-codec.0-0x1a", |