diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2010-12-19 21:05:52 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-20 08:46:09 -0500 |
commit | dc6ee063937f7d2e79cd1ae1596a6fe896ffa3f9 (patch) | |
tree | b2cf531903c68a162359dc36a0faab6791f18051 /sound/soc/samsung | |
parent | de4987ab104da973deeb651166960d4aae19812d (diff) |
ASoC: SMDK6442: 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>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r-- | sound/soc/samsung/Kconfig | 4 | ||||
-rw-r--r-- | sound/soc/samsung/smdk_wm8580.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index c8aa73eb39c3..1e73f7079567 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 | 3 | depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 |
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 |
@@ -62,7 +62,7 @@ config ASOC_SAMSUNG_JIVE_WM8750 | |||
62 | 62 | ||
63 | config ASOC_SAMSUNG_SMDK_WM8580 | 63 | config 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) | 65 | depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442) |
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 e4f3bc8c1248..c149f73adac8 100644 --- a/sound/soc/samsung/smdk_wm8580.c +++ b/sound/soc/samsung/smdk_wm8580.c | |||
@@ -254,7 +254,7 @@ static int __init smdk_audio_init(void) | |||
254 | int ret; | 254 | int ret; |
255 | char *str; | 255 | char *str; |
256 | 256 | ||
257 | if (machine_is_smdkc100()) { | 257 | if (machine_is_smdkc100() || machine_is_smdk6442()) { |
258 | smdk.num_links = 3; | 258 | smdk.num_links = 3; |
259 | /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */ | 259 | /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */ |
260 | str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name; | 260 | str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name; |