ASoC: SMDK64XX: Switch to IISv4 CPU driver

Switch the MACHINE driver to use IISv4 CPU dai.
Remove BROKEN dependency now that we have proper CPU driver available.
Also, disable build for SMDK6400, since the S3C6400 doesn't have IISv4
controller.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index c0c7edf792fd0de6627c485b074dddb7e8ada1d9..2a7cc222d098f57b139744525612be50157d651f 100644 (file)
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -64,12 +64,11 @@ config SND_S3C24XX_SOC_JIVE_WM8750
 
 config SND_S3C64XX_SOC_WM8580
        tristate "SoC I2S Audio support for WM8580 on SMDK64XX"
-       depends on SND_S3C24XX_SOC && (MACH_SMDK6400 || MACH_SMDK6410)
-       depends on BROKEN
+       depends on SND_S3C24XX_SOC && MACH_SMDK6410
        select SND_SOC_WM8580
-       select SND_S3C64XX_SOC_I2S
+       select SND_S3C64XX_SOC_I2S_V4
        help
-         Sat Y if you want to add support for SoC audio on the SMDK64XX.
+         Say Y if you want to add support for SoC audio on the SMDK6410.
 
 config SND_S3C24XX_SOC_SMDK2443_WM9710
        tristate "SoC AC97 Audio support for SMDK2443 - WM9710"

diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c
index efe4901213a396281970b12cabd5bc1b5ec66665..07e8e51d10d60e925e05062cd331a58a36ba64c4 100644 (file)
--- a/sound/soc/s3c24xx/smdk64xx_wm8580.c
+++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c
@@ -22,8 +22,6 @@
 #include "s3c-dma.h"
 #include "s3c64xx-i2s.h"
 
-#define S3C64XX_I2S_V4 2
-
 /* SMDK64XX has a 12MHZ crystal attached to WM8580 */
 #define SMDK64XX_WM8580_FREQ 12000000
 
@@ -215,7 +213,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = {
 { /* Primary Playback i/f */
        .name = "WM8580 PAIF RX",
        .stream_name = "Playback",
-       .cpu_dai = &s3c64xx_i2s_dai[S3C64XX_I2S_V4],
+       .cpu_dai = &s3c64xx_i2s_v4_dai,
        .codec_dai = &wm8580_dai[WM8580_DAI_PAIFRX],
        .init = smdk64xx_wm8580_init_paifrx,
        .ops = &smdk64xx_ops,
@@ -223,7 +221,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = {
 { /* Primary Capture i/f */
        .name = "WM8580 PAIF TX",
        .stream_name = "Capture",
-       .cpu_dai = &s3c64xx_i2s_dai[S3C64XX_I2S_V4],
+       .cpu_dai = &s3c64xx_i2s_v4_dai,
        .codec_dai = &wm8580_dai[WM8580_DAI_PAIFTX],
        .init = smdk64xx_wm8580_init_paiftx,
        .ops = &smdk64xx_ops,