Browse Source

ASoC: AC97: LN2440SBC: Switch to s3c-ac97.c

Switch to use s3c-ac97.c AC97 controller driver.

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>
Jassi Brar 15 years ago
parent
commit
c67d90ffd4
2 changed files with 5 additions and 6 deletions
  1. 3 4
      sound/soc/s3c24xx/Kconfig
  2. 2 2
      sound/soc/s3c24xx/ln2440sbc_alc650.c

+ 3 - 4
sound/soc/s3c24xx/Kconfig

@@ -29,9 +29,6 @@ config SND_S3C_SOC_PCM
 
 config SND_S3C2443_SOC_AC97
 	tristate
-	select S3C2410_DMA
-	select AC97_BUS
-	select SND_SOC_AC97_BUS
 
 config SND_S3C_SOC_AC97
 	tristate
@@ -86,8 +83,10 @@ config SND_S3C24XX_SOC_SMDK2443_WM9710
 config SND_S3C24XX_SOC_LN2440SBC_ALC650
 	tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
 	depends on SND_S3C24XX_SOC && ARCH_S3C2410
-	select SND_S3C2443_SOC_AC97
+	select S3C2410_DMA
+	select AC97_BUS
 	select SND_SOC_AC97_CODEC
+	select SND_S3C_SOC_AC97
 	help
 	  Say Y if you want to add support for SoC audio on ln2440sbc
 	  with the ALC650.

+ 2 - 2
sound/soc/s3c24xx/ln2440sbc_alc650.c

@@ -25,7 +25,7 @@
 
 #include "../codecs/ac97.h"
 #include "s3c-dma.h"
-#include "s3c24xx-ac97.h"
+#include "s3c-ac97.h"
 
 static struct snd_soc_card ln2440sbc;
 
@@ -33,7 +33,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = {
 {
 	.name = "AC97",
 	.stream_name = "AC97 HiFi",
-	.cpu_dai = &s3c2443_ac97_dai[0],
+	.cpu_dai = &s3c_ac97_dai[S3C_AC97_DAI_PCM],
 	.codec_dai = &ac97_dai,
 },
 };