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

Commit 32eca984 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/fsl' into tmp

parents 05780d77 25b8d314

sound/soc/fsl/Kconfig

+2 −7
Original line number Diff line number Diff line
@@ -108,18 +108,13 @@ if SND_IMX_SOC 
config SND_SOC_IMX_SSI

	tristate



config SND_SOC_IMX_PCM

	tristate



config SND_SOC_IMX_PCM_FIQ

	bool

	tristate

	select FIQ

	select SND_SOC_IMX_PCM



config SND_SOC_IMX_PCM_DMA

	bool

	tristate

	select SND_SOC_DMAENGINE_PCM

	select SND_SOC_IMX_PCM



config SND_SOC_IMX_AUDMUX

	tristate

sound/soc/fsl/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ endif 
obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o

obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o



obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o

obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += snd-soc-imx-pcm-fiq.o

snd-soc-imx-pcm-fiq-y := imx-pcm-fiq.o imx-pcm.o

obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += snd-soc-imx-pcm-dma.o

snd-soc-imx-pcm-dma-y := imx-pcm-dma.o imx-pcm.o



# i.MX Machine Support

snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o

sound/soc/fsl/imx-pcm.c

+0 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, 
			runtime->dma_bytes);

	return ret;

}

EXPORT_SYMBOL_GPL(snd_imx_pcm_mmap);



static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)

{
@@ -80,7 +79,6 @@ int imx_pcm_new(struct snd_soc_pcm_runtime *rtd) 
out:

	return ret;

}

EXPORT_SYMBOL_GPL(imx_pcm_new);



void imx_pcm_free(struct snd_pcm *pcm)

{
@@ -102,7 +100,6 @@ void imx_pcm_free(struct snd_pcm *pcm) 
		buf->area = NULL;

	}

}

EXPORT_SYMBOL_GPL(imx_pcm_free);



MODULE_DESCRIPTION("Freescale i.MX PCM driver");

MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");