Merge branch 'for-2.6.37' into for-2.6.38
This commit is contained in:
commit
cbe80def41
|
@ -222,9 +222,9 @@ static int __init at91sam9g20ek_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
pllb = clk_get(NULL, "pllb");
|
pllb = clk_get(NULL, "pllb");
|
||||||
if (IS_ERR(mclk)) {
|
if (IS_ERR(pllb)) {
|
||||||
printk(KERN_ERR "ASoC: Failed to get PLLB\n");
|
printk(KERN_ERR "ASoC: Failed to get PLLB\n");
|
||||||
ret = PTR_ERR(mclk);
|
ret = PTR_ERR(pllb);
|
||||||
goto err_mclk;
|
goto err_mclk;
|
||||||
}
|
}
|
||||||
ret = clk_set_parent(mclk, pllb);
|
ret = clk_set_parent(mclk, pllb);
|
||||||
|
|
|
@ -383,6 +383,7 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = {
|
||||||
.reg_cache_size = sizeof(stac9766_reg),
|
.reg_cache_size = sizeof(stac9766_reg),
|
||||||
.reg_word_size = sizeof(u16),
|
.reg_word_size = sizeof(u16),
|
||||||
.reg_cache_step = 2,
|
.reg_cache_step = 2,
|
||||||
|
.reg_cache_default = stac9766_reg,
|
||||||
};
|
};
|
||||||
|
|
||||||
static __devinit int stac9766_probe(struct platform_device *pdev)
|
static __devinit int stac9766_probe(struct platform_device *pdev)
|
||||||
|
|
|
@ -146,7 +146,6 @@ static int wm8523_startup(struct snd_pcm_substream *substream,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
|
||||||
snd_pcm_hw_constraint_list(substream->runtime, 0,
|
snd_pcm_hw_constraint_list(substream->runtime, 0,
|
||||||
SNDRV_PCM_HW_PARAM_RATE,
|
SNDRV_PCM_HW_PARAM_RATE,
|
||||||
&wm8523->rate_constraint);
|
&wm8523->rate_constraint);
|
||||||
|
|
|
@ -2515,6 +2515,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8994 = {
|
||||||
.resume = wm8994_resume,
|
.resume = wm8994_resume,
|
||||||
.read = wm8994_read,
|
.read = wm8994_read,
|
||||||
.write = wm8994_write,
|
.write = wm8994_write,
|
||||||
|
.readable_register = wm8994_readable,
|
||||||
|
.volatile_register = wm8994_volatile,
|
||||||
.set_bias_level = wm8994_set_bias_level,
|
.set_bias_level = wm8994_set_bias_level,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
mout_epll = clk_get(NULL, "mout_epll");
|
mout_epll = clk_get(NULL, "mout_epll");
|
||||||
if (IS_ERR(fout_epll)) {
|
if (IS_ERR(mout_epll)) {
|
||||||
printk(KERN_WARNING "%s: Cannot find mout_epll.\n",
|
printk(KERN_WARNING "%s: Cannot find mout_epll.\n",
|
||||||
__func__);
|
__func__);
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
|
@ -54,7 +54,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
sclk_spdif = clk_get(NULL, "sclk_spdif");
|
sclk_spdif = clk_get(NULL, "sclk_spdif");
|
||||||
if (IS_ERR(fout_epll)) {
|
if (IS_ERR(sclk_spdif)) {
|
||||||
printk(KERN_WARNING "%s: Cannot find sclk_spdif.\n",
|
printk(KERN_WARNING "%s: Cannot find sclk_spdif.\n",
|
||||||
__func__);
|
__func__);
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
|
|
Loading…
Reference in New Issue