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

Commit 1ae4e9b9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.0' into for-3.1

parents df1553c8 53dea36c

sound/soc/imx/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ menuconfig SND_IMX_SOC 


if SND_IMX_SOC



config SND_MXC_SOC_SSI

	tristate



config SND_MXC_SOC_FIQ

	tristate
@@ -24,7 +21,6 @@ config SND_MXC_SOC_WM1133_EV1 
	tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"

	depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL

	select SND_SOC_WM8350

	select SND_MXC_SOC_SSI

	select SND_MXC_SOC_FIQ

	help

	  Enable support for audio on the i.MX31ADS with the WM1133-EV1
@@ -34,7 +30,6 @@ config SND_SOC_MX27VIS_AIC32X4 
	tristate "SoC audio support for Visstrim M10 boards"

	depends on MACH_IMX27_VISSTRIM_M10

	select SND_SOC_TVL320AIC32X4

	select SND_MXC_SOC_SSI

	select SND_MXC_SOC_MX2

	help

	  Say Y if you want to add support for SoC audio on Visstrim SM10
@@ -44,7 +39,6 @@ config SND_SOC_PHYCORE_AC97 
	tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"

	depends on MACH_PCM043 || MACH_PCA100

	select SND_SOC_WM9712

	select SND_MXC_SOC_SSI

	select SND_MXC_SOC_FIQ

	help

	  Say Y if you want to add support for SoC audio on Phytec phyCORE
@@ -57,7 +51,6 @@ config SND_SOC_EUKREA_TLV320 
		|| MACH_EUKREA_MBIMXSD35_BASEBOARD \

		|| MACH_EUKREA_MBIMXSD51_BASEBOARD

	select SND_SOC_TLV320AIC23

	select SND_MXC_SOC_SSI

	select SND_MXC_SOC_FIQ

	help

	  Enable I2S based access to the TLV320AIC23B codec attached

sound/soc/imx/imx-pcm-dma-mx2.c

+2 −0
Original line number Diff line number Diff line
@@ -337,3 +337,5 @@ static void __exit snd_imx_pcm_exit(void) 
	platform_driver_unregister(&imx_pcm_driver);

}

module_exit(snd_imx_pcm_exit);

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:imx-pcm-audio");

sound/soc/imx/imx-ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -775,4 +775,4 @@ module_exit(imx_ssi_exit); 
MODULE_AUTHOR("Sascha Hauer, <s.hauer@pengutronix.de>");

MODULE_DESCRIPTION("i.MX I2S/ac97 SoC Interface");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:imx-ssi");

sound/soc/pxa/pxa2xx-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -97,14 +97,14 @@ static int pxa2xx_soc_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (dai->driver->playback.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = pxa2xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto out;

	}



	if (dai->driver->capture.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		ret = pxa2xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_CAPTURE);

		if (ret)