aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-12-19 21:05:55 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-20 08:46:18 -0500
commit40d2482993d39f3b99973b6e94b358fa1e1f0679 (patch)
tree4831519efd1f461cbcd8c26c941ad09480f14302
parente3bd3e182d0b936923445e03aa259b1d50d83a20 (diff)
ASoC: SMDKC110: Enable I2S device
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>
-rw-r--r--sound/soc/samsung/Kconfig2
-rw-r--r--sound/soc/samsung/smdk_wm8580.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index e718ec1966f1..472951da79f8 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -62,7 +62,7 @@ config ASOC_SAMSUNG_JIVE_WM8750
62 62
63config ASOC_SAMSUNG_SMDK_WM8580 63config ASOC_SAMSUNG_SMDK_WM8580
64 tristate "SoC I2S Audio support for WM8580 on SMDK" 64 tristate "SoC I2S Audio support for WM8580 on SMDK"
65 depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210) 65 depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210 || MACH_SMDKC110)
66 select SND_SOC_WM8580 66 select SND_SOC_WM8580
67 select SND_SAMSUNG_I2S 67 select SND_SAMSUNG_I2S
68 help 68 help
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index f37b9da69690..b2cff1a44aed 100644
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -255,7 +255,7 @@ static int __init smdk_audio_init(void)
255 char *str; 255 char *str;
256 256
257 if (machine_is_smdkc100() || machine_is_smdk6442() 257 if (machine_is_smdkc100() || machine_is_smdk6442()
258 || machine_is_smdkv210()) { 258 || machine_is_smdkv210() || machine_is_smdkc110()) {
259 smdk.num_links = 3; 259 smdk.num_links = 3;
260 /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */ 260 /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */
261 str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name; 261 str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name;