diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-04 05:25:21 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-21 00:14:49 +0200 |
| commit | b45281412a6334ab2be5d7e449c98f50fb424a78 (patch) | |
| tree | 9ee9ac0e28ec2f5802349ff6e8e0db64d8804a49 /sound | |
| parent | ASoC: pxa: TTC DKB audio needs I2C (diff) | |
| download | linux-b45281412a6334ab2be5d7e449c98f50fb424a78.tar.xz linux-b45281412a6334ab2be5d7e449c98f50fb424a78.zip | |
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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/arm/pxa2xx-pcm.c | 2 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-pcm.h | 3 | ||||
| -rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 2 | ||||
| -rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c index e6c727b317fb..83be8e3f095e 100644 --- a/sound/arm/pxa2xx-pcm.c +++ b/sound/arm/pxa2xx-pcm.c @@ -14,6 +14,8 @@ #include <linux/dma-mapping.h> #include <linux/dmaengine.h> +#include <mach/dma.h> + #include <sound/core.h> #include <sound/pxa2xx-lib.h> #include <sound/dmaengine_pcm.h> diff --git a/sound/arm/pxa2xx-pcm.h b/sound/arm/pxa2xx-pcm.h index 2a8fc08d52a1..00330985beec 100644 --- a/sound/arm/pxa2xx-pcm.h +++ b/sound/arm/pxa2xx-pcm.h @@ -9,12 +9,11 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <mach/dma.h> struct pxa2xx_runtime_data { int dma_ch; 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; }; diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index a3119a00d8fa..9b19ee70291f 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -34,8 +34,6 @@ #include <sound/pxa2xx-lib.h> #include <sound/dmaengine_pcm.h> -#include <mach/hardware.h> - #include "../../arm/pxa2xx-pcm.h" #include "pxa-ssp.h" diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index d58b09f4f7a4..42f2f0175981 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -15,6 +15,8 @@ #include <linux/dmaengine.h> #include <linux/of.h> +#include <mach/dma.h> + #include <sound/core.h> #include <sound/soc.h> #include <sound/pxa2xx-lib.h> |