diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2010-12-19 21:05:56 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-20 08:46:23 -0500 |
commit | 4d81acff4099ae5eccd113f10e8038b65b1fc638 (patch) | |
tree | 354f1bce2e65daf4c8d33f2800f89e302b4f07f5 /sound/soc/samsung | |
parent | 40d2482993d39f3b99973b6e94b358fa1e1f0679 (diff) |
ASoC: SMDKV310: Enable AC97 device
Enable AC97 audio device on SMDKV310/C210.
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/samsung')
-rw-r--r-- | sound/soc/samsung/Kconfig | 4 | ||||
-rw-r--r-- | sound/soc/samsung/smdk_wm9713.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 472951da79f8..9cedf345933c 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config ASOC_SAMSUNG | 1 | config ASOC_SAMSUNG |
2 | tristate "ASoC support for Samsung" | 2 | tristate "ASoC support for Samsung" |
3 | depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 | 3 | depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PV310 |
4 | select S3C64XX_DMA if ARCH_S3C64XX | 4 | select S3C64XX_DMA if ARCH_S3C64XX |
5 | select S3C2410_DMA if ARCH_S3C2410 | 5 | select S3C2410_DMA if ARCH_S3C2410 |
6 | help | 6 | help |
@@ -134,7 +134,7 @@ config ASOC_SAMSUNG_RX1950_UDA1380 | |||
134 | 134 | ||
135 | config ASOC_SAMSUNG_SMDK_WM9713 | 135 | config ASOC_SAMSUNG_SMDK_WM9713 |
136 | tristate "SoC AC97 Audio support for SMDK with WM9713" | 136 | tristate "SoC AC97 Audio support for SMDK with WM9713" |
137 | depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110) | 137 | depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110 || MACH_SMDKV310 || MACH_SMDKC210) |
138 | select SND_SOC_WM9713 | 138 | select SND_SOC_WM9713 |
139 | select SND_SAMSUNG_AC97 | 139 | select SND_SAMSUNG_AC97 |
140 | help | 140 | help |
diff --git a/sound/soc/samsung/smdk_wm9713.c b/sound/soc/samsung/smdk_wm9713.c index 238cb3a38c5d..ae5fed6f772f 100644 --- a/sound/soc/samsung/smdk_wm9713.c +++ b/sound/soc/samsung/smdk_wm9713.c | |||
@@ -27,6 +27,7 @@ static struct snd_soc_card smdk; | |||
27 | * SMDKC100: Set CFG6 1-3 On, CFG7 1 On | 27 | * SMDKC100: Set CFG6 1-3 On, CFG7 1 On |
28 | * SMDKC110: Set CFGB10 1-2 Off, CFGB12 1-3 On | 28 | * SMDKC110: Set CFGB10 1-2 Off, CFGB12 1-3 On |
29 | * SMDKV210: Set CFGB10 1-2 Off, CFGB12 1-3 On | 29 | * SMDKV210: Set CFGB10 1-2 Off, CFGB12 1-3 On |
30 | * SMDKV310: Set CFG2 1-2 Off, CFG4 All On, CFG7 All Off, CFG8 1-On | ||
30 | */ | 31 | */ |
31 | 32 | ||
32 | /* | 33 | /* |