mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 20:02:17 +00:00
ASoC: SMARTQ: Move to use new I2S driver
Modify the smartq_wm8987.c to use new i2s 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>
This commit is contained in:
parent
1c7ac01807
commit
b9493d6c33
2 changed files with 15 additions and 18 deletions
|
@ -145,7 +145,7 @@ config SND_SOC_SMDK_WM9713
|
||||||
config SND_S3C64XX_SOC_SMARTQ
|
config SND_S3C64XX_SOC_SMARTQ
|
||||||
tristate "SoC I2S Audio support for SmartQ board"
|
tristate "SoC I2S Audio support for SmartQ board"
|
||||||
depends on SND_S3C24XX_SOC && MACH_SMARTQ
|
depends on SND_S3C24XX_SOC && MACH_SMARTQ
|
||||||
select SND_S3C64XX_SOC_I2S
|
select SND_SAMSUNG_I2S
|
||||||
select SND_SOC_WM8750
|
select SND_SOC_WM8750
|
||||||
|
|
||||||
config SND_SOC_GONI_AQUILA_WM8994
|
config SND_SOC_GONI_AQUILA_WM8994
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
|
|
||||||
#include "dma.h"
|
#include "dma.h"
|
||||||
#include "s3c64xx-i2s.h"
|
#include "i2s.h"
|
||||||
|
|
||||||
#include "../codecs/wm8750.h"
|
#include "../codecs/wm8750.h"
|
||||||
|
|
||||||
|
@ -41,13 +41,9 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
|
struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
|
||||||
struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
|
struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
|
||||||
struct s3c_i2sv2_rate_calc div;
|
|
||||||
unsigned int clk = 0;
|
unsigned int clk = 0;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
s3c_i2sv2_iis_calc_rate(&div, NULL, params_rate(params),
|
|
||||||
s3c_i2sv2_get_clock(cpu_dai));
|
|
||||||
|
|
||||||
switch (params_rate(params)) {
|
switch (params_rate(params)) {
|
||||||
case 8000:
|
case 8000:
|
||||||
case 16000:
|
case 16000:
|
||||||
|
@ -78,23 +74,24 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
/* Use PCLK for I2S signal generation */
|
||||||
|
ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0,
|
||||||
|
0, SND_SOC_CLOCK_IN);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
/* Gate the RCLK output on PAD */
|
||||||
|
ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_CDCLK,
|
||||||
|
0, SND_SOC_CLOCK_IN);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
/* set the codec system clock for DAC and ADC */
|
/* set the codec system clock for DAC and ADC */
|
||||||
ret = snd_soc_dai_set_sysclk(codec_dai, WM8750_SYSCLK, clk,
|
ret = snd_soc_dai_set_sysclk(codec_dai, WM8750_SYSCLK, clk,
|
||||||
SND_SOC_CLOCK_IN);
|
SND_SOC_CLOCK_IN);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
/* set MCLK division for sample rate */
|
|
||||||
ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_I2SV2_DIV_RCLK, div.fs_div);
|
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
/* set prescaler division for sample rate */
|
|
||||||
ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_I2SV2_DIV_PRESCALER,
|
|
||||||
div.clk_div - 1);
|
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -212,7 +209,7 @@ static struct snd_soc_dai_link smartq_dai[] = {
|
||||||
{
|
{
|
||||||
.name = "wm8987",
|
.name = "wm8987",
|
||||||
.stream_name = "SmartQ Hi-Fi",
|
.stream_name = "SmartQ Hi-Fi",
|
||||||
.cpu_dai_name = "s3c64xx-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm8750-hifi",
|
.codec_dai_name = "wm8750-hifi",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-audio",
|
||||||
.codec_name = "wm8750-codec.0-0x1a",
|
.codec_name = "wm8750-codec.0-0x1a",
|
||||||
|
|
Loading…
Reference in a new issue