renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
Code

ASoC: Fix SmartQ compilation

Browse Source 
This makes the SmartQ sound driver compile again with recent ASoC changes.

Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Maurus Cuelenaere 2011-01-02 20:48:23 +01:00 committed by Mark Brown
parent 776065e36d
commit 2742f2ada3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/s3c24xx/smartq_wm8987.c
View File

@ -39,8 +39,8 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
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->codec_dai;
struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct s3c_i2sv2_rate_calc div; struct s3c_i2sv2_rate_calc div;
unsigned int clk = 0; unsigned int clk = 0;
int ret; int ret;
@ -156,8 +156,9 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"LINPUT2", NULL, "Mic Bias"}, {"LINPUT2", NULL, "Mic Bias"},
}; };
static int smartq_wm8987_init(struct snd_soc_codec *codec) static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_codec *codec = rtd->codec;
int err = 0; int err = 0;
/* Add SmartQ specific widgets */ /* Add SmartQ specific widgets */
@ -190,8 +191,8 @@ static int smartq_wm8987_init(struct snd_soc_codec *codec)
return err; return err;
/* Headphone jack detection */ /* Headphone jack detection */
err = snd_soc_jack_new(&snd_soc_smartq, "Headphone Jack", err = snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
SND_JACK_HEADPHONE, &smartq_jack); &smartq_jack);
if (err) if (err)
return err; return err;