]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ASoC: SMDKV210: Enable I2S device
authorJassi Brar <jassi.brar@samsung.com>
Mon, 20 Dec 2010 02:05:53 +0000 (11:05 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Dec 2010 13:46:14 +0000 (13:46 +0000)
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>
sound/soc/samsung/Kconfig
sound/soc/samsung/smdk_wm8580.c

index 1e73f707956750868f9ffa6723d79641acbd535d..e718ec1966f1ec688138113afe811fa5290d4d40 100644 (file)
@@ -62,7 +62,7 @@ config ASOC_SAMSUNG_JIVE_WM8750
 
 config ASOC_SAMSUNG_SMDK_WM8580
        tristate "SoC I2S Audio support for WM8580 on SMDK"
-       depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442)
+       depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210)
        select SND_SOC_WM8580
        select SND_SAMSUNG_I2S
        help
index c149f73adac8efde57d076f27a28a8b1adf04e32..f37b9da696908ec6ebdce38ae42d2da89c34f830 100644 (file)
@@ -254,7 +254,8 @@ static int __init smdk_audio_init(void)
        int ret;
        char *str;
 
-       if (machine_is_smdkc100() || machine_is_smdk6442()) {
+       if (machine_is_smdkc100() || machine_is_smdk6442()
+                       || machine_is_smdkv210()) {
                smdk.num_links = 3;
                /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */
                str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name;