Skip to content

Commit

Permalink
ASoC: pxa: remove mach header dependency
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Xia Kaixu <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
arndb authored and broonie committed May 20, 2014
1 parent 482b91c commit b452814
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions sound/arm/pxa2xx-pcm.c
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 1 addition & 2 deletions sound/arm/pxa2xx-pcm.h
Original file line number Diff line number Diff line change
@@ -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;
};

2 changes: 0 additions & 2 deletions sound/soc/pxa/pxa-ssp.c
Original file line number Diff line number Diff line change
@@ -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"

2 changes: 2 additions & 0 deletions sound/soc/pxa/pxa2xx-pcm.c
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit b452814

Please sign in to comment.