evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branches 'asoc/fix/88pm860', 'asoc/fix/omap' and 'asoc/fix/si476x' into asoc-linus

Browse source
This commit is contained in:
Mark Brown 2014-03-10 11:30:56 +00:00
commit 7f35afd44b
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/soc/codecs/88pm860x-codec.c
View file

@ -1328,6 +1328,9 @@ static int pm860x_probe(struct snd_soc_codec *codec)
pm860x->codec = codec; pm860x->codec = codec;
codec->control_data = pm860x->regmap; codec->control_data = pm860x->regmap;
ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
if (ret)
return ret;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
ret = request_threaded_irq(pm860x->irq[i], NULL, ret = request_threaded_irq(pm860x->irq[i], NULL,

2
sound/soc/codecs/si476x.c
View file

@ -210,7 +210,7 @@ out:
static int si476x_codec_probe(struct snd_soc_codec *codec) static int si476x_codec_probe(struct snd_soc_codec *codec)
{ {
codec->control_data = dev_get_regmap(codec->dev->parent, NULL); codec->control_data = dev_get_regmap(codec->dev->parent, NULL);
return 0; return snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
} }
static struct snd_soc_dai_ops si476x_dai_ops = { static struct snd_soc_dai_ops si476x_dai_ops = {

4
sound/soc/omap/n810.c
View file

@ -305,7 +305,9 @@ static int __init n810_soc_init(void)
int err; int err;
struct device *dev; struct device *dev;
if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax())) if (!of_have_populated_dt() ||
(!of_machine_is_compatible("nokia,n810") &&
!of_machine_is_compatible("nokia,n810-wimax")))
return -ENODEV; return -ENODEV;
n810_snd_device = platform_device_alloc("soc-audio", -1); n810_snd_device = platform_device_alloc("soc-audio", -1);