diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2010-01-27 01:01:03 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-27 15:49:49 -0500 |
commit | 1ec2963a8cd5fbc5f49dfa20c94229f1b46d1968 (patch) | |
tree | 0c53f80fcda74a4fcb9436598dd79662920f4197 /sound/soc/s3c24xx | |
parent | ff6e64dabf66b8e4e7def21857320085fc68db6b (diff) |
ASoC: AC97: SMDK2443: Switch to s3c-ac97.c
Switch to use s3c-ac97.c AC97 controller driver.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx')
-rw-r--r-- | sound/soc/s3c24xx/Kconfig | 4 | ||||
-rw-r--r-- | sound/soc/s3c24xx/smdk2443_wm9710.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index d1c6f9392463..8b62798a04b8 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig | |||
@@ -75,8 +75,10 @@ config SND_S3C64XX_SOC_WM8580 | |||
75 | config SND_S3C24XX_SOC_SMDK2443_WM9710 | 75 | config SND_S3C24XX_SOC_SMDK2443_WM9710 |
76 | tristate "SoC AC97 Audio support for SMDK2443 - WM9710" | 76 | tristate "SoC AC97 Audio support for SMDK2443 - WM9710" |
77 | depends on SND_S3C24XX_SOC && MACH_SMDK2443 | 77 | depends on SND_S3C24XX_SOC && MACH_SMDK2443 |
78 | select SND_S3C2443_SOC_AC97 | 78 | select S3C2410_DMA |
79 | select AC97_BUS | ||
79 | select SND_SOC_AC97_CODEC | 80 | select SND_SOC_AC97_CODEC |
81 | select SND_S3C_SOC_AC97 | ||
80 | help | 82 | help |
81 | Say Y if you want to add support for SoC audio on smdk2443 | 83 | Say Y if you want to add support for SoC audio on smdk2443 |
82 | with the WM9710. | 84 | with the WM9710. |
diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c index 12b783b12fcb..362258835e8d 100644 --- a/sound/soc/s3c24xx/smdk2443_wm9710.c +++ b/sound/soc/s3c24xx/smdk2443_wm9710.c | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | #include "../codecs/ac97.h" | 22 | #include "../codecs/ac97.h" |
23 | #include "s3c-dma.h" | 23 | #include "s3c-dma.h" |
24 | #include "s3c24xx-ac97.h" | 24 | #include "s3c-ac97.h" |
25 | 25 | ||
26 | static struct snd_soc_card smdk2443; | 26 | static struct snd_soc_card smdk2443; |
27 | 27 | ||
@@ -29,7 +29,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { | |||
29 | { | 29 | { |
30 | .name = "AC97", | 30 | .name = "AC97", |
31 | .stream_name = "AC97 HiFi", | 31 | .stream_name = "AC97 HiFi", |
32 | .cpu_dai = &s3c2443_ac97_dai[0], | 32 | .cpu_dai = &s3c_ac97_dai[S3C_AC97_DAI_PCM], |
33 | .codec_dai = &ac97_dai, | 33 | .codec_dai = &ac97_dai, |
34 | }, | 34 | }, |
35 | }; | 35 | }; |