Commit b4528141 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown

ASoC: pxa: remove mach header dependency

As we are moving the mmp platform towards multiplatform support,
we have to stop including platform header files.

This changes the pxa-ssp sound driver file to no longer depend
on mach/hardware.h and mach/dma.h. The code using the definitions
from those headers is actually gone already, the only thing
that was still being used was the pxa_dma_desc typedef, which
we can easily work around by using the normal 'struct pxa_dma_desc'
name.

The pxa2xx-dma driver still uses this header, so we include it
explicitly there, which is ok because that is only used on pxa,
not on mmp.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarXia Kaixu <kaixu.xia@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 482b91c7
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include <mach/dma.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pxa2xx-lib.h> #include <sound/pxa2xx-lib.h>
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
......
...@@ -9,12 +9,11 @@ ...@@ -9,12 +9,11 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <mach/dma.h>
struct pxa2xx_runtime_data { struct pxa2xx_runtime_data {
int dma_ch; int dma_ch;
struct snd_dmaengine_dai_dma_data *params; struct snd_dmaengine_dai_dma_data *params;
pxa_dma_desc *dma_desc_array; struct pxa_dma_desc *dma_desc_array;
dma_addr_t dma_desc_array_phys; dma_addr_t dma_desc_array_phys;
}; };
......
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#include <sound/pxa2xx-lib.h> #include <sound/pxa2xx-lib.h>
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
#include <mach/hardware.h>
#include "../../arm/pxa2xx-pcm.h" #include "../../arm/pxa2xx-pcm.h"
#include "pxa-ssp.h" #include "pxa-ssp.h"
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include <linux/of.h> #include <linux/of.h>
#include <mach/dma.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/pxa2xx-lib.h> #include <sound/pxa2xx-lib.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment