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

Commit 7f35afd4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/88pm860', 'asoc/fix/omap' and... 

Merge remote-tracking branches 'asoc/fix/88pm860', 'asoc/fix/omap' and 'asoc/fix/si476x' into asoc-linus
parents b25b1b6d 8eeb5c15 ea2787f3 58d4d3c9

sound/soc/codecs/88pm860x-codec.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -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,

sound/soc/codecs/si476x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 = {

sound/soc/omap/n810.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -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);