From d752b8d9007d0685939c225122b25ba7bb93ef10 Mon Sep 17 00:00:00 2001 From: Jassi Brar Date: Thu, 27 May 2010 12:11:44 +0900 Subject: [PATCH] --- yaml --- r: 206515 b: refs/heads/master c: ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a h: refs/heads/master i: 206513: 4a5e60603a5e9edc2829ac1f3b966be816f3ddac 206511: 2344d71af35fbc4634cde3ef38e528f81de4db63 v: v3 --- [refs] | 2 +- trunk/sound/soc/s3c24xx/Kconfig | 4 ++-- trunk/sound/soc/s3c24xx/smdk_wm9713.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6028f6e73e43..5a6a10de72ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dedece4a5ebad4db43e72ba9b2236ff01bc4271 +refs/heads/master: ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a diff --git a/trunk/sound/soc/s3c24xx/Kconfig b/trunk/sound/soc/s3c24xx/Kconfig index aa112d3c2066..292d817c9a94 100644 --- a/trunk/sound/soc/s3c24xx/Kconfig +++ b/trunk/sound/soc/s3c24xx/Kconfig @@ -1,6 +1,6 @@ config SND_S3C24XX_SOC tristate "SoC Audio for the Samsung S3CXXXX chips" - depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 + depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 select S3C64XX_DMA if ARCH_S3C64XX help Say Y or M if you want to add support for codecs attached to @@ -120,7 +120,7 @@ config SND_S3C24XX_SOC_SIMTEC_HERMES config SND_SOC_SMDK_WM9713 tristate "SoC AC97 Audio support for SMDK with WM9713" - depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100) + depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110) select SND_SOC_WM9713 select SND_S3C_SOC_AC97 help diff --git a/trunk/sound/soc/s3c24xx/smdk_wm9713.c b/trunk/sound/soc/s3c24xx/smdk_wm9713.c index 7dd85e5e81a4..5527b9e88c98 100644 --- a/trunk/sound/soc/s3c24xx/smdk_wm9713.c +++ b/trunk/sound/soc/s3c24xx/smdk_wm9713.c @@ -26,6 +26,8 @@ static struct snd_soc_card smdk; * * SMDK6410: Set CFG1 1-3 On, CFG2 1-4 Off * SMDKC100: Set CFG6 1-3 On, CFG7 1 On + * SMDKC110: Set CFGB10 1-2 Off, CFGB12 1-3 On + * SMDKV210: Set CFGB10 1-2 Off, CFGB12 1-3 On */ /*