linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 15/15] ASoC: pxa: remove mach header dependency
@ 2014-05-04  3:25 Xia Kaixu
  2014-05-20 22:15 ` Mark Brown
  0 siblings, 1 reply; 3+ messages in thread
From: Xia Kaixu @ 2014-05-04  3:25 UTC (permalink / raw)
  To: linux-kernel
  Cc: kaixu.xia, linaro-kernel, Arnd Bergmann, Liam Girdwood,
	Mark Brown, Eric Miao, Russell King, Haojian Zhuang,
	linux-arm-kernel, alsa-devel

From: Arnd Bergmann <arnd@arndb.de>

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>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: alsa-devel@alsa-project.org
---
 sound/arm/pxa2xx-pcm.c     |    2 ++
 sound/arm/pxa2xx-pcm.h     |    3 +--
 sound/soc/pxa/pxa-ssp.c    |    2 --
 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 e6c727b..83be8e3 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 2a8fc08..0033098 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 a3119a0..9b19ee7 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 d58b09f..42f2f01 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>
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 00/15] ASoC: Arnds randconfig fixes for ASoC
@ 2014-04-29 11:18 Xia Kaixu
  2014-04-29 11:18 ` [PATCH 15/15] ASoC: pxa: remove mach header dependency Xia Kaixu
  0 siblings, 1 reply; 3+ messages in thread
From: Xia Kaixu @ 2014-04-29 11:18 UTC (permalink / raw)
  To: linux-kernel; +Cc: linaro-kernel, arnd, kaixu.xia

This patchset series addresses various bugs found and fixed by Arnd Bergmann
whilst doing randconfig builds.

My involvement has been to review, add/check the maintainers are correct
and submit upstream to try and reduce the backlog.

Best Regards,

Kaixu Xia

Arnd Bergmann (11):
  ASoC: CS42L51 and WM8962 codecs depend on INPUT
  ASoC: davinci: add dependencies for SND_SOC_TLV320AIC3X
  ASoC: SMDK_WM8580_PCM needs REGMAP_I2C
  ASoC: samsung-idma: avoid 64-bit division
  ASoC: nuc900: export nuc900_ac97_data
  ASoC: RX-51 audio needs I2C
  ASoC: UDA1380 needs I2C
  ASoC: Atmel WM8904 codec support needs I2C
  ASoC: SND_S3C_DMA_LEGACY needs S3C24XX_DMA
  ASoC: Amstrad E3 needs TTY support for codec
  ASoC: pxa: remove mach header dependency

Xia Kaixu (4):
  ASoC: TTC DKB audio needs I2C
  ASoC: Migo-R sound needs I2C
  ASoC: TLV320AIC23 and Simtec Hermes audio need I2C
  ASoC: WM0010 needs SPI

 sound/arm/pxa2xx-pcm.c         |    2 ++
 sound/arm/pxa2xx-pcm.h         |    3 +--
 sound/soc/atmel/Kconfig        |    2 +-
 sound/soc/codecs/Kconfig       |    8 ++++----
 sound/soc/davinci/Kconfig      |   10 +++++-----
 sound/soc/fsl/Kconfig          |    2 +-
 sound/soc/nuc900/Kconfig       |    1 +
 sound/soc/nuc900/nuc900-ac97.c |    1 +
 sound/soc/omap/Kconfig         |    4 ++--
 sound/soc/pxa/Kconfig          |    2 +-
 sound/soc/pxa/pxa-ssp.c        |    2 --
 sound/soc/pxa/pxa2xx-pcm.c     |    2 ++
 sound/soc/samsung/Kconfig      |   22 ++++++++++------------
 sound/soc/samsung/idma.c       |    2 +-
 sound/soc/sh/Kconfig           |    2 +-
 15 files changed, 33 insertions(+), 32 deletions(-)

-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-20 22:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-04  3:25 [PATCH 15/15] ASoC: pxa: remove mach header dependency Xia Kaixu
2014-05-20 22:15 ` Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2014-04-29 11:18 [PATCH 00/15] ASoC: Arnds randconfig fixes for ASoC Xia Kaixu
2014-04-29 11:18 ` [PATCH 15/15] ASoC: pxa: remove mach header dependency Xia Kaixu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).