From e55060791661a46f7a6b6be97f6e683182f4c72b Mon Sep 17 00:00:00 2001 From: Jassi Brar Date: Thu, 27 May 2010 12:11:31 +0900 Subject: [PATCH] --- yaml --- r: 206514 b: refs/heads/master c: 3dedece4a5ebad4db43e72ba9b2236ff01bc4271 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/s3c24xx/Kconfig | 4 ++-- trunk/sound/soc/s3c24xx/smdk_wm9713.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 90c3d769cc2d..6028f6e73e43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 021f80cc701a31c0962de7f1cc96b16309140b1f +refs/heads/master: 3dedece4a5ebad4db43e72ba9b2236ff01bc4271 diff --git a/trunk/sound/soc/s3c24xx/Kconfig b/trunk/sound/soc/s3c24xx/Kconfig index 2a7cc222d098..aa112d3c2066 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 + depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 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 + depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100) 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 24fd39f38ccb..7dd85e5e81a4 100644 --- a/trunk/sound/soc/s3c24xx/smdk_wm9713.c +++ b/trunk/sound/soc/s3c24xx/smdk_wm9713.c @@ -25,6 +25,7 @@ static struct snd_soc_card smdk; * Default CFG switch settings to use this driver: * * SMDK6410: Set CFG1 1-3 On, CFG2 1-4 Off + * SMDKC100: Set CFG6 1-3 On, CFG7 1 On */ /*