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

Commit c012cdc8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 15439bde f6b864a9

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -4604,7 +4604,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c 
F:	arch/arm/mach-omap2/clockdomain44xx.c

F:	arch/arm/mach-omap2/clockdomain44xx.c





OMAP AUDIO SUPPORT

OMAP AUDIO SUPPORT

M:	Jarkko Nikula <jhnikula@gmail.com>

M:	Jarkko Nikula <jarkko.nikula@bitmer.com>

L:	alsa-devel@alsa-project.org (subscribers-only)

L:	alsa-devel@alsa-project.org (subscribers-only)

L:	linux-omap@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained

S:	Maintained

include/sound/tlv320aic3x.h

+1 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Platform data for Texas Instruments TLV320AIC3x codec

 * Platform data for Texas Instruments TLV320AIC3x codec

 *

 *

 * Author: Jarkko Nikula <jhnikula@gmail.com>

 * Author: Jarkko Nikula <jarkko.nikula@bitmer.com>

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * it under the terms of the GNU General Public License version 2 as

sound/soc/codecs/wm8750.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -778,11 +778,19 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) 
	return 0;

	return 0;

}

}





static const struct spi_device_id wm8750_spi_ids[] = {

	{ "wm8750", 0 },

	{ "wm8987", 0 },

	{ },

};

MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);



static struct spi_driver wm8750_spi_driver = {

static struct spi_driver wm8750_spi_driver = {

	.driver = {

	.driver = {

		.name	= "wm8750-codec",

		.name	= "wm8750-codec",

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

	},

	},

	.id_table	= wm8750_spi_ids,

	.probe		= wm8750_spi_probe,

	.probe		= wm8750_spi_probe,

	.remove		= __devexit_p(wm8750_spi_remove),

	.remove		= __devexit_p(wm8750_spi_remove),

};

};

sound/soc/codecs/wm8903.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -2046,8 +2046,13 @@ static int wm8903_probe(struct snd_soc_codec *codec) 
/* power down chip */

/* power down chip */

static int wm8903_remove(struct snd_soc_codec *codec)

static int wm8903_remove(struct snd_soc_codec *codec)

{

{

	struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);



	wm8903_free_gpio(codec);

	wm8903_free_gpio(codec);

	wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF);

	wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF);

	if (wm8903->irq)

		free_irq(wm8903->irq, codec);



	return 0;

	return 0;

}

}

sound/soc/codecs/wm8994.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2981,6 +2981,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) 
			wm8994->hubs.dcs_readback_mode = 1;

			wm8994->hubs.dcs_readback_mode = 1;

			break;

			break;

		}

		}

		break;





	case WM8958:

	case WM8958:

		wm8994->hubs.dcs_readback_mode = 1;

		wm8994->hubs.dcs_readback_mode = 1;