Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fff21a8 authored by Jassi Brar's avatar Jassi Brar Committed by Mark Brown
Browse files

ASoC: SMDK64XX: Move to use new I2S driver 



Modify the smdk64xx_wm8580.c to use new i2s controller driver.

Signed-off-by: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fcd8c742

sound/soc/s3c24xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ config SND_S3C64XX_SOC_WM8580 
	tristate "SoC I2S Audio support for WM8580 on SMDK64XX"

	depends on SND_S3C24XX_SOC && MACH_SMDK6410

	select SND_SOC_WM8580

	select SND_S3C64XX_SOC_I2S_V4

	select SND_SAMSUNG_I2S

	help

	  Say Y if you want to add support for SoC audio on the SMDK6410.

sound/soc/s3c24xx/smdk64xx_wm8580.c

+3 −22
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include "../codecs/wm8580.h"

#include "dma.h"

#include "s3c64xx-i2s.h"

#include "i2s.h"



/*

 * Default CFG switch settings to use this driver:
@@ -95,17 +95,6 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream, 
	if (ret < 0)

		return ret;



	ret = snd_soc_dai_set_sysclk(cpu_dai, S3C64XX_CLKSRC_CDCLK,

					0, SND_SOC_CLOCK_IN);

	if (ret < 0)

		return ret;



	/* We use PCLK for basic ops in SoC-Slave mode */

	ret = snd_soc_dai_set_sysclk(cpu_dai, S3C64XX_CLKSRC_PCLK,

					0, SND_SOC_CLOCK_IN);

	if (ret < 0)

		return ret;



	/* Set WM8580 to drive MCLK from its PLLA */

	ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK,

					WM8580_CLKSRC_PLLA);
@@ -122,14 +111,6 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream, 
	if (ret < 0)

		return ret;



	ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_I2SV2_DIV_BCLK, bfs);

	if (ret < 0)

		return ret;



	ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_I2SV2_DIV_RCLK, rfs);

	if (ret < 0)

		return ret;



	return 0;

}
@@ -223,7 +204,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { 
{ /* Primary Playback i/f */

	.name = "WM8580 PAIF RX",

	.stream_name = "Playback",

	.cpu_dai_name = "samsung-i2s-v4",

	.cpu_dai_name = "samsung-i2s.2",

	.codec_dai_name = "wm8580-hifi-playback",

	.platform_name = "samsung-audio",

	.codec_name = "wm8580-codec.0-001b",
@@ -233,7 +214,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { 
{ /* Primary Capture i/f */

	.name = "WM8580 PAIF TX",

	.stream_name = "Capture",

	.cpu_dai_name = "samsung-i2s-v4",

	.cpu_dai_name = "samsung-i2s.2",

	.codec_dai_name = "wm8580-hifi-capture",

	.platform_name = "samsung-audio",

	.codec_name = "wm8580-codec.0-001b",