evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: atmel-soc: make it buildable on other architectures

Browse source 
Not very useful on non AT91/AVR32 platforms but it provides
more build coverage and prepares for ARM multiplatform.

Also fixes a couple of format type warnings.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Joachim Eastwood 2012-12-08 14:23:22 +01:00 • committed by Mark Brown
parent f4319ff2bd
commit 153f5a18e4
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/soc/atmel/Kconfig
View file

@ -1,6 +1,6 @@
config SND_ATMEL_SOC config SND_ATMEL_SOC
tristate "SoC Audio for the Atmel System-on-Chip" tristate "SoC Audio for the Atmel System-on-Chip"
depends on ARCH_AT91 depends on HAS_IOMEM
help help
Say Y or M if you want to add support for codecs attached to Say Y or M if you want to add support for codecs attached to
the ATMEL SSC interface. You will also need the ATMEL SSC interface. You will also need
@ -24,7 +24,7 @@ config SND_ATMEL_SOC_SSC
config SND_AT91_SOC_SAM9G20_WM8731 config SND_AT91_SOC_SAM9G20_WM8731
tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board" tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
depends on ATMEL_SSC && SND_ATMEL_SOC && AT91_PROGRAMMABLE_CLOCKS depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC && AT91_PROGRAMMABLE_CLOCKS
select SND_ATMEL_SOC_PDC select SND_ATMEL_SOC_PDC
select SND_ATMEL_SOC_SSC select SND_ATMEL_SOC_SSC
select SND_SOC_WM8731 select SND_SOC_WM8731
@ -34,7 +34,7 @@ config SND_AT91_SOC_SAM9G20_WM8731
config SND_AT91_SOC_AFEB9260 config SND_AT91_SOC_AFEB9260
tristate "SoC Audio support for AFEB9260 board" tristate "SoC Audio support for AFEB9260 board"
depends on ATMEL_SSC && ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC depends on ARCH_AT91 && ATMEL_SSC && ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC
select SND_ATMEL_SOC_PDC select SND_ATMEL_SOC_PDC
select SND_ATMEL_SOC_SSC select SND_ATMEL_SOC_SSC
select SND_SOC_TLV320AIC23 select SND_SOC_TLV320AIC23

4
sound/soc/atmel/atmel-pcm-pdc.c
View file

@ -159,7 +159,7 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream,
pr_debug("atmel-pcm: " pr_debug("atmel-pcm: "
"hw_params: DMA for %s initialized " "hw_params: DMA for %s initialized "
"(dma_bytes=%u, period_size=%u)\n", "(dma_bytes=%zu, period_size=%zu)\n",
prtd->params->name, prtd->params->name,
runtime->dma_bytes, runtime->dma_bytes,
prtd->period_size); prtd->period_size);
@ -201,7 +201,7 @@ static int atmel_pcm_trigger(struct snd_pcm_substream *substream,
int ret = 0; int ret = 0;
pr_debug("atmel-pcm:buffer_size = %ld," pr_debug("atmel-pcm:buffer_size = %ld,"
"dma_area = %p, dma_bytes = %u\n", "dma_area = %p, dma_bytes = %zu\n",
rtd->buffer_size, rtd->dma_area, rtd->dma_bytes); rtd->buffer_size, rtd->dma_area, rtd->dma_bytes);
switch (cmd) { switch (cmd) {

2
sound/soc/atmel/atmel-pcm.c
View file

@ -49,7 +49,7 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm,
buf->private_data = NULL; buf->private_data = NULL;
buf->area = dma_alloc_coherent(pcm->card->dev, size, buf->area = dma_alloc_coherent(pcm->card->dev, size,
&buf->addr, GFP_KERNEL); &buf->addr, GFP_KERNEL);
pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%d\n", pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu\n",
(void *)buf->area, (void *)buf->addr, size); (void *)buf->area, (void *)buf->addr, size);
if (!buf->area) if (!buf->area)

2
sound/soc/atmel/atmel_ssc_dai.c
View file

@ -42,8 +42,6 @@
#include <sound/initval.h> #include <sound/initval.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <mach/hardware.h>
#include "atmel-pcm.h" #include "atmel-pcm.h"
#include "atmel_ssc_dai.h" #include "atmel_ssc_dai.h"