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

Commit 6ca4aba4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/4554', 'asoc/topic/ab8500',... 

Merge remote-tracking branches 'asoc/topic/4554', 'asoc/topic/ab8500', 'asoc/topic/ak4642', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next
parents 7ad2d1d5 f7d4bfee b3f5dbec 39c26180 158bf4ed ada602b3

sound/soc/atmel/Kconfig

+6 −3
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ config SND_ATMEL_SOC_SSC 


config SND_AT91_SOC_SAM9G20_WM8731

	tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"

	depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC

	depends on ARCH_AT91 || COMPILE_TEST

	depends on ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI

	select SND_ATMEL_SOC_PDC

	select SND_ATMEL_SOC_SSC

	select SND_SOC_WM8731
@@ -35,7 +36,8 @@ config SND_AT91_SOC_SAM9G20_WM8731 


config SND_ATMEL_SOC_WM8904

	tristate "Atmel ASoC driver for boards using WM8904 codec"

	depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC && I2C

	depends on ARCH_AT91 || COMPILE_TEST

	depends on ATMEL_SSC && SND_ATMEL_SOC && I2C

	select SND_ATMEL_SOC_SSC

	select SND_ATMEL_SOC_DMA

	select SND_SOC_WM8904
@@ -45,7 +47,8 @@ config SND_ATMEL_SOC_WM8904 


config SND_AT91_SOC_SAM9X5_WM8731

	tristate "SoC Audio support for WM8731-based at91sam9x5 board"

	depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC

	depends on ARCH_AT91 || COMPILE_TEST

	depends on ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI

	select SND_ATMEL_SOC_SSC

	select SND_ATMEL_SOC_DMA

	select SND_SOC_WM8731

sound/soc/atmel/Makefile

+0 −2
Original line number Diff line number Diff line 
# AT91 Platform Support

snd-soc-atmel-pcm-objs := atmel-pcm.o

snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o

snd-soc-atmel-pcm-dma-objs := atmel-pcm-dma.o

snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o



obj-$(CONFIG_SND_ATMEL_SOC) += snd-soc-atmel-pcm.o

obj-$(CONFIG_SND_ATMEL_SOC_PDC) += snd-soc-atmel-pcm-pdc.o

obj-$(CONFIG_SND_ATMEL_SOC_DMA) += snd-soc-atmel-pcm-dma.o

obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o

sound/soc/atmel/atmel-pcm-dma.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = { 
	.period_bytes_max	= 2 * 0xffff,	/* if 2 bytes format */

	.periods_min		= 8,

	.periods_max		= 1024,		/* no limit */

	.buffer_bytes_max	= ATMEL_SSC_DMABUF_SIZE,

	.buffer_bytes_max	= 512 * 1024,

};



/**
@@ -119,7 +119,7 @@ static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream, 
static const struct snd_dmaengine_pcm_config atmel_dmaengine_pcm_config = {

	.prepare_slave_config = atmel_pcm_configure_dma,

	.pcm_hardware = &atmel_pcm_dma_hardware,

	.prealloc_buffer_size = ATMEL_SSC_DMABUF_SIZE,

	.prealloc_buffer_size = 64 * 1024,

};



int atmel_pcm_dma_platform_register(struct device *dev)

sound/soc/atmel/atmel-pcm-pdc.c

+79 −0
Original line number Diff line number Diff line
@@ -47,6 +47,85 @@ 
#include "atmel-pcm.h"





static int atmel_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 = ATMEL_SSC_DMABUF_SIZE;



	buf->dev.type = SNDRV_DMA_TYPE_DEV;

	buf->dev.dev = pcm->card->dev;

	buf->private_data = NULL;

	buf->area = dma_alloc_coherent(pcm->card->dev, size,

			&buf->addr, GFP_KERNEL);

	pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu\n",

			(void *)buf->area, (void *)(long)buf->addr, size);



	if (!buf->area)

		return -ENOMEM;



	buf->bytes = size;

	return 0;

}



static int atmel_pcm_mmap(struct snd_pcm_substream *substream,

	struct vm_area_struct *vma)

{

	return remap_pfn_range(vma, vma->vm_start,

		       substream->dma_buffer.addr >> PAGE_SHIFT,

		       vma->vm_end - vma->vm_start, vma->vm_page_prot);

}



static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_pcm *pcm = rtd->pcm;

	int ret;



	ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));

	if (ret)

		return ret;



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

		pr_debug("atmel-pcm: allocating PCM playback DMA buffer\n");

		ret = atmel_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto out;

	}



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

		pr_debug("atmel-pcm: allocating PCM capture DMA buffer\n");

		ret = atmel_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_CAPTURE);

		if (ret)

			goto out;

	}

 out:

	return ret;

}



static void atmel_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_coherent(pcm->card->dev, buf->bytes,

				  buf->area, buf->addr);

		buf->area = NULL;

	}

}



/*--------------------------------------------------------------------------*\

 * Hardware definition

\*--------------------------------------------------------------------------*/

sound/soc/atmel/atmel-pcm.c

deleted100644 → 0
+0 −121
Original line number Diff line number Diff line 
/*

 * atmel-pcm.c  --  ALSA PCM interface for the Atmel atmel SoC.

 *

 *  Copyright (C) 2005 SAN People

 *  Copyright (C) 2008 Atmel

 *

 * Authors: Sedji Gaouaou <sedji.gaouaou@atmel.com>

 *

 * Based on at91-pcm. by:

 * Frank Mandarino <fmandarino@endrelia.com>

 * Copyright 2006 Endrelia Technologies Inc.

 *

 * Based on pxa2xx-pcm.c by:

 *

 * Author:	Nicolas Pitre

 * Created:	Nov 30, 2004

 * Copyright:	(C) 2004 MontaVista Software, Inc.

 *

 * 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.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <sound/pcm.h>

#include <sound/soc.h>

#include "atmel-pcm.h"



static int atmel_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 = ATMEL_SSC_DMABUF_SIZE;



	buf->dev.type = SNDRV_DMA_TYPE_DEV;

	buf->dev.dev = pcm->card->dev;

	buf->private_data = NULL;

	buf->area = dma_alloc_coherent(pcm->card->dev, size,

			&buf->addr, GFP_KERNEL);

	pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu\n",

			(void *)buf->area, (void *)(long)buf->addr, size);



	if (!buf->area)

		return -ENOMEM;



	buf->bytes = size;

	return 0;

}



int atmel_pcm_mmap(struct snd_pcm_substream *substream,

	struct vm_area_struct *vma)

{

	return remap_pfn_range(vma, vma->vm_start,

		       substream->dma_buffer.addr >> PAGE_SHIFT,

		       vma->vm_end - vma->vm_start, vma->vm_page_prot);

}

EXPORT_SYMBOL_GPL(atmel_pcm_mmap);



int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_pcm *pcm = rtd->pcm;

	int ret;



	ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));

	if (ret)

		return ret;



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

		pr_debug("atmel-pcm: allocating PCM playback DMA buffer\n");

		ret = atmel_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto out;

	}



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

		pr_debug("atmel-pcm: allocating PCM capture DMA buffer\n");

		ret = atmel_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_CAPTURE);

		if (ret)

			goto out;

	}

 out:

	return ret;

}

EXPORT_SYMBOL_GPL(atmel_pcm_new);



void atmel_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_coherent(pcm->card->dev, buf->bytes,

				  buf->area, buf->addr);

		buf->area = NULL;

	}

}

EXPORT_SYMBOL_GPL(atmel_pcm_free);