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

Commit 81fd7e48 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

parents 1f2e7a90 151edfc7

drivers/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ config ICS932S401 


config ATMEL_SSC

	tristate "Device driver for Atmel SSC peripheral"

	depends on AVR32 || ARCH_AT91

	depends on HAS_IOMEM

	---help---

	  This option enables device driver support for Atmel Synchronized

	  Serial Communication peripheral (SSC).

drivers/misc/atmel-ssc.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static int ssc_probe(struct platform_device *pdev) 


	/* disable all interrupts */

	clk_enable(ssc->clk);

	ssc_writel(ssc->regs, IDR, ~0UL);

	ssc_writel(ssc->regs, IDR, -1);

	ssc_readl(ssc->regs, SR);

	clk_disable(ssc->clk);

sound/soc/atmel/Kconfig

+3 −3
Original line number Diff line number Diff line 
config SND_ATMEL_SOC

	tristate "SoC Audio for the Atmel System-on-Chip"

	depends on ARCH_AT91

	depends on HAS_IOMEM

	help

	  Say Y or M if you want to add support for codecs attached to

	  the ATMEL SSC interface. You will also need
@@ -24,7 +24,7 @@ config SND_ATMEL_SOC_SSC 


config SND_AT91_SOC_SAM9G20_WM8731

	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_SSC

	select SND_SOC_WM8731
@@ -34,7 +34,7 @@ config SND_AT91_SOC_SAM9G20_WM8731 


config SND_AT91_SOC_AFEB9260

	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_SSC

	select SND_SOC_TLV320AIC23

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

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream, 


	pr_debug("atmel-pcm: "

		"hw_params: DMA for %s initialized "

		"(dma_bytes=%u, period_size=%u)\n",

		"(dma_bytes=%zu, period_size=%zu)\n",

		prtd->params->name,

		runtime->dma_bytes,

		prtd->period_size);
@@ -201,7 +201,7 @@ static int atmel_pcm_trigger(struct snd_pcm_substream *substream, 
	int ret = 0;



	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);



	switch (cmd) {

sound/soc/atmel/atmel-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, 
	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=%d\n",

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

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



	if (!buf->area)