Skip to content

Commit

Permalink
ASoC: SMDK64XX: Switch to IISv4 CPU driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jassi Brar authored and Mark Brown committed May 7, 2010
1 parent af56b1c commit d0bbc24
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
7 changes: 3 additions & 4 deletions sound/soc/s3c24xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions sound/soc/s3c24xx/smdk64xx_wm8580.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -215,15 +213,15 @@ 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,
},
{ /* 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,
Expand Down

0 comments on commit d0bbc24

Please sign in to comment.