ASoC: atmel-pcm-pdc: merge atmel-pcm back in

Browse source

atmel-pcm.c was split into two files to create a generic framework for both PDC
and DMA.

atmel-pcm-dma.c is using the generic dmaengine framework since 95e0e07e71
(ASoC: atmel-pcm: use generic dmaengine framework).

Merge atmel-pcm.c in atmel-pcm-pdc.c as this is now the only user.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

...

This commit is contained in:

Alexandre Belloni 2015-03-30 19:54:54 +02:00 • committed by Mark Brown

parent b6d6c6e95f

commit 488cb53391

4 changed files with 79 additions and 128 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

sound/soc/atmel/Makefile

View file

79

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

View file

121

sound/soc/atmel/atmel-pcm.c

View file

5

sound/soc/atmel/atmel-pcm.h

View file