ASoC: imx: separate imx-pcm bits from imx-ssi driver (4762fbab) · Commits · 戴 / test

sound/soc/imx/Kconfig

+6 −1

Original line number	Diff line number	Diff line
		@@ -8,13 +8,18 @@ menuconfig SND_IMX_SOC

		if SND_IMX_SOC

		config SND_SOC_IMX_PCM
		tristate

		config SND_MXC_SOC_FIQ
		select FIQ
		tristate
		select FIQ
		select SND_SOC_IMX_PCM

		config SND_MXC_SOC_MX2
		select SND_SOC_DMAENGINE_PCM
		tristate
		select SND_SOC_IMX_PCM

		config SND_SOC_IMX_AUDMUX
		tristate

sound/soc/imx/Makefile

+5 −4

Original line number	Diff line number	Diff line
		# i.MX Platform Support
		snd-soc-imx-objs := imx-ssi.o
		snd-soc-imx-fiq-objs := imx-pcm-fiq.o
		snd-soc-imx-mx2-objs := imx-pcm-dma-mx2.o
		snd-soc-imx-audmux-objs := imx-audmux.o

		obj-$(CONFIG_SND_IMX_SOC) += snd-soc-imx.o
		obj-$(CONFIG_SND_MXC_SOC_FIQ) += snd-soc-imx-fiq.o
		obj-$(CONFIG_SND_MXC_SOC_MX2) += snd-soc-imx-mx2.o
		obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o

		obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o
		snd-soc-imx-pcm-y := imx-pcm.o
		snd-soc-imx-pcm-$(CONFIG_SND_MXC_SOC_FIQ) += imx-pcm-fiq.o
		snd-soc-imx-pcm-$(CONFIG_SND_MXC_SOC_MX2) += imx-pcm-dma-mx2.o

		# i.MX Machine Support
		snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
		snd-soc-phycore-ac97-objs := phycore-ac97.o

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@

		#include <mach/dma.h>

		#include "imx-ssi.h"
		#include "imx-pcm.h"

		static bool filter(struct dma_chan chan, void param)
		{

sound/soc/imx/imx-pcm.c

0 → 100644

+105 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2009 Sascha Hauer <s.hauer@pengutronix.de>
		*
		* This code is based on code copyrighted by Freescale,
		* Liam Girdwood, Javier Martin and probably others.
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the
		* Free Software Foundation; either version 2 of the License, or (at your
		* option) any later version.
		*/

		#include <linux/dma-mapping.h>
		#include <linux/module.h>
		#include <sound/pcm.h>
		#include <sound/soc.h>
		#include "imx-pcm.h"

		int snd_imx_pcm_mmap(struct snd_pcm_substream *substream,
		struct vm_area_struct *vma)
		{
		struct snd_pcm_runtime *runtime = substream->runtime;
		int ret;

		ret = dma_mmap_writecombine(substream->pcm->card->dev, vma,
		runtime->dma_area, runtime->dma_addr, runtime->dma_bytes);

		pr_debug("%s: ret: %d %p 0x%08x 0x%08x\n", __func__, ret,
		runtime->dma_area,
		runtime->dma_addr,
		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)
		{
		struct snd_pcm_substream *substream = pcm->streams[stream].substream;
		struct snd_dma_buffer *buf = &substream->dma_buffer;
		size_t size = IMX_SSI_DMABUF_SIZE;

		buf->dev.type = SNDRV_DMA_TYPE_DEV;
		buf->dev.dev = pcm->card->dev;
		buf->private_data = NULL;
		buf->area = dma_alloc_writecombine(pcm->card->dev, size,
		&buf->addr, GFP_KERNEL);
		if (!buf->area)
		return -ENOMEM;
		buf->bytes = size;

		return 0;
		}

		static u64 imx_pcm_dmamask = DMA_BIT_MASK(32);

		int imx_pcm_new(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_card *card = rtd->card->snd_card;
		struct snd_pcm *pcm = rtd->pcm;
		int ret = 0;

		if (!card->dev->dma_mask)
		card->dev->dma_mask = &imx_pcm_dmamask;
		if (!card->dev->coherent_dma_mask)
		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
		if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
		ret = imx_pcm_preallocate_dma_buffer(pcm,
		SNDRV_PCM_STREAM_PLAYBACK);
		if (ret)
		goto out;
		}

		if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
		ret = imx_pcm_preallocate_dma_buffer(pcm,
		SNDRV_PCM_STREAM_CAPTURE);
		if (ret)
		goto out;
		}

		out:
		return ret;
		}
		EXPORT_SYMBOL_GPL(imx_pcm_new);

		void imx_pcm_free(struct snd_pcm *pcm)
		{
		struct snd_pcm_substream *substream;
		struct snd_dma_buffer *buf;
		int stream;

		for (stream = 0; stream < 2; stream++) {
		substream = pcm->streams[stream].substream;
		if (!substream)
		continue;

		buf = &substream->dma_buffer;
		if (!buf->area)
		continue;

		dma_free_writecombine(pcm->card->dev, buf->bytes,
		buf->area, buf->addr);
		buf->area = NULL;
		}
		}
		EXPORT_SYMBOL_GPL(imx_pcm_free);

sound/soc/imx/imx-pcm.h

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2009 Sascha Hauer <s.hauer@pengutronix.de>
		*
		* This code is based on code copyrighted by Freescale,
		* Liam Girdwood, Javier Martin and probably others.
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the
		* Free Software Foundation; either version 2 of the License, or (at your
		* option) any later version.
		*/

		#ifndef _IMX_PCM_H
		#define _IMX_PCM_H

		/*
		* Do not change this as the FIQ handler depends on this size
		*/
		#define IMX_SSI_DMABUF_SIZE (64 * 1024)

		struct imx_pcm_dma_params {
		int dma;
		unsigned long dma_addr;
		int burstsize;
		};

		int snd_imx_pcm_mmap(struct snd_pcm_substream *substream,
		struct vm_area_struct *vma);
		int imx_pcm_new(struct snd_soc_pcm_runtime *rtd);
		void imx_pcm_free(struct snd_pcm *pcm);

		#endif /* _IMX_PCM_H */

Admin message