Re: [alsa-devel] [PATCH 18/30] ASoC: samsung: move plat/ headers to local directory
On Fri, Apr 12, 2013 at 01:04:22PM +0200, Lars-Peter Clausen wrote: > On 04/11/2013 07:19 PM, Mark Brown wrote: > > Hrm, someone killed GTA02 support? That's sad... if that's really the > > case we could kill the machine driver but not tonight as I'm running > > late... > I think the file was moved, we should pull over the audio relevant GPIO > definitions into the ASoC board driver. Yeah, so I see - Heiko sent a patch fixing this. signature.asc Description: Digital signature
Re: [alsa-devel] [PATCH 18/30] ASoC: samsung: move plat/ headers to local directory
On 04/11/2013 07:19 PM, Mark Brown wrote: > On Thu, Apr 11, 2013 at 07:08:42PM +0200, Arnd Bergmann wrote: >> On Thursday 11 April 2013, Mark Brown wrote: > >>> This doesn't apply to my topic/samsung branch, can you please regenerate >>> it against that or let me know what to apply it against? > >> This one should work. Unfortunately I now found during testing that the >> s3c24xx sound support has a few build errors at the moment, but this >> patch should not add any new ones: > > Applied (after hand editing the commit message), thanks. > >> make[5]: *** [sound/soc/samsung/i2s.o] Error 1 >> /git/arm-soc/sound/soc/samsung/neo1973_wm8753.c:25:24: fatal error: >> mach/gta02.h: No such file or directory >> #include > > Hrm, someone killed GTA02 support? That's sad... if that's really the > case we could kill the machine driver but not tonight as I'm running > late... I think the file was moved, we should pull over the audio relevant GPIO definitions into the ASoC board driver. - Lars -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/30] ASoC: samsung: move plat/ headers to local directory
On Thu, Apr 11, 2013 at 07:08:42PM +0200, Arnd Bergmann wrote: > On Thursday 11 April 2013, Mark Brown wrote: > > This doesn't apply to my topic/samsung branch, can you please regenerate > > it against that or let me know what to apply it against? > This one should work. Unfortunately I now found during testing that the > s3c24xx sound support has a few build errors at the moment, but this > patch should not add any new ones: Applied (after hand editing the commit message), thanks. > make[5]: *** [sound/soc/samsung/i2s.o] Error 1 > /git/arm-soc/sound/soc/samsung/neo1973_wm8753.c:25:24: fatal error: > mach/gta02.h: No such file or directory > #include Hrm, someone killed GTA02 support? That's sad... if that's really the case we could kill the machine driver but not tonight as I'm running late... signature.asc Description: Digital signature
Re: [PATCH 18/30] ASoC: samsung: move plat/ headers to local directory
On Thursday 11 April 2013, Mark Brown wrote:
> On Thu, Apr 11, 2013 at 02:05:00AM +0200, Arnd Bergmann wrote:
> > The plat/iis.h and plat/ac97.h files in the samsung platform are
> > only needed by the ASoC drivers, so they can be moved into the
> > same directory, as one more step towards a multiplatform build.
>
> This doesn't apply to my topic/samsung branch, can you please regenerate
> it against that or let me know what to apply it against?
>
This one should work. Unfortunately I now found during testing that the
s3c24xx sound support has a few build errors at the moment, but this
patch should not add any new ones:
/git/arm-soc/sound/soc/samsung/idma.c: In function 'idma_close':
/git/arm-soc/sound/soc/samsung/idma.c:327:11: error: 'IRQ_I2S0' undeclared
(first use in this function)
free_irq(IRQ_I2S0, prtd);
^
make[5]: *** [sound/soc/samsung/idma.o] Error 1
make[5]: *** Waiting for unfinished jobs
make[5]: *** [sound/soc/samsung/i2s.o] Error 1
/git/arm-soc/sound/soc/samsung/neo1973_wm8753.c:25:24: fatal error:
mach/gta02.h: No such file or directory
#include
^
Arnd
8<
>From 91cb290e665b10d094729a42f9e676e2de154996 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann
Date: Sat, 16 Mar 2013 09:10:15 +0100
Subject: [PATCH] ASoC: samsung: move plat/ headers to local directory
The plat/regs-iis.h and plat/regs-ac97.h files in the samsung platform
are only needed by the ASoC drivers, so they can be moved into the same
directory, as one more step towards a multiplatform build.
Signed-off-by: Arnd Bergmann
Cc: alsa-de...@alsa-project.org
Cc: Mark Brown
Cc: Liam Girdwood
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2410.c
b/arch/arm/mach-s3c24xx/dma-s3c2410.c
index 25d085a..a4a13c9 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2410.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2410.c
@@ -25,11 +25,9 @@
#include
#include
-#include
#include
#include
#include
-#include
#include
static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2412.c
b/arch/arm/mach-s3c24xx/dma-s3c2412.c
index d2408ba..6eaa7a4 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2412.c
@@ -25,11 +25,9 @@
#include
#include
-#include
#include
#include
#include
-#include
#include
#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)|
DMA_CH_VALID }
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2440.c
b/arch/arm/mach-s3c24xx/dma-s3c2440.c
index 0b86e74..477d450 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2440.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2440.c
@@ -25,11 +25,9 @@
#include
#include
-#include
#include
#include
#include
-#include
#include
static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2443.c
b/arch/arm/mach-s3c24xx/dma-s3c2443.c
index 0553625..80a8d56 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2443.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2443.c
@@ -25,11 +25,9 @@
#include
#include
-#include
#include
#include
#include
-#include
#include
#define MAP(x) { \
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 0df3c56..c76abdf 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -20,7 +20,7 @@
#include
#include
-#include
+#include "regs-ac97.h"
#include
#include "dma.h"
diff --git a/sound/soc/samsung/h1940_uda1380.c
b/sound/soc/samsung/h1940_uda1380.c
index 15a3817..fa91376 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -20,7 +20,7 @@
#include
#include
-#include
+#include "regs-iis.h"
#include
#include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/neo1973_wm8753.c
b/sound/soc/samsung/neo1973_wm8753.c
index a301d8c..ccc601d 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -21,7 +21,7 @@
#include
#include
-#include
+#include "regs-iis.h"
#include
#include "../codecs/wm8753.h"
diff --git a/arch/arm/plat-samsung/include/plat/regs-ac97.h
b/sound/soc/samsung/regs-ac97.h
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/regs-ac97.h
rename to sound/soc/samsung/regs-ac97.h
diff --git a/arch/arm/plat-samsung/include/plat/regs-iis.h
b/sound/soc/samsung/regs-iis.h
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/regs-iis.h
rename to sound/soc/samsung/regs-iis.h
diff --git a/sound/soc/samsung/rx1950_uda1380.c
b/sound/soc/samsung/rx1950_uda1380.c
index a5826ea..704460a 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -24,7 +24,7 @@
#include
#include
-#include
+#include "regs-iis.h"
#include
#include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 13f6dd1..a7b17c1 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -24,7 +24,7 @@
#inc
Re: [PATCH 18/30] ASoC: samsung: move plat/ headers to local directory
On Thu, Apr 11, 2013 at 02:05:00AM +0200, Arnd Bergmann wrote: > The plat/iis.h and plat/ac97.h files in the samsung platform are > only needed by the ASoC drivers, so they can be moved into the > same directory, as one more step towards a multiplatform build. This doesn't apply to my topic/samsung branch, can you please regenerate it against that or let me know what to apply it against? signature.asc Description: Digital signature
[PATCH 18/30] ASoC: samsung: move plat/ headers to local directory
The plat/iis.h and plat/ac97.h files in the samsung platform are
only needed by the ASoC drivers, so they can be moved into the
same directory, as one more step towards a multiplatform build.
Signed-off-by: Arnd Bergmann
Cc: alsa-de...@alsa-project.org
Cc: Mark Brown
Cc: Liam Girdwood
---
arch/arm/mach-s3c24xx/dma-s3c2410.c | 2 --
arch/arm/mach-s3c24xx/dma-s3c2412.c | 2 --
arch/arm/mach-s3c24xx/dma-s3c2440.c | 2 --
arch/arm/mach-s3c24xx/dma-s3c2443.c | 2 --
sound/soc/samsung/ac97.c | 2 +-
sound/soc/samsung/h1940_uda1380.c | 2 +-
sound/soc/samsung/neo1973_wm8753.c| 2 +-
{arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-ac97.h | 0
{arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-iis.h | 0
sound/soc/samsung/rx1950_uda1380.c| 2 +-
sound/soc/samsung/s3c24xx-i2s.c | 2 +-
sound/soc/samsung/s3c24xx_uda134x.c | 2 +-
12 files changed, 6 insertions(+), 14 deletions(-)
rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-ac97.h
(100%)
rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-iis.h
(100%)
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2410.c
b/arch/arm/mach-s3c24xx/dma-s3c2410.c
index a6c94b8..30aa53f 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2410.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2410.c
@@ -25,10 +25,8 @@
#include
#include
-#include
#include
#include
-#include
#include
static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2412.c
b/arch/arm/mach-s3c24xx/dma-s3c2412.c
index c0e8c3f..ab1700e 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2412.c
@@ -25,10 +25,8 @@
#include
#include
-#include
#include
#include
-#include
#include
#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)|
DMA_CH_VALID }
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2440.c
b/arch/arm/mach-s3c24xx/dma-s3c2440.c
index 1c08eccd..cd25de2 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2440.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2440.c
@@ -25,10 +25,8 @@
#include
#include
-#include
#include
#include
-#include
#include
static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2443.c
b/arch/arm/mach-s3c24xx/dma-s3c2443.c
index 000e4c6..5fe3539 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2443.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2443.c
@@ -25,10 +25,8 @@
#include
#include
-#include
#include
#include
-#include
#include
#define MAP(x) { \
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 0df3c56..c76abdf 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -20,7 +20,7 @@
#include
#include
-#include
+#include "regs-ac97.h"
#include
#include "dma.h"
diff --git a/sound/soc/samsung/h1940_uda1380.c
b/sound/soc/samsung/h1940_uda1380.c
index 15a3817..fa91376 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -20,7 +20,7 @@
#include
#include
-#include
+#include "regs-iis.h"
#include
#include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/neo1973_wm8753.c
b/sound/soc/samsung/neo1973_wm8753.c
index a301d8c..ccc601d 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -21,7 +21,7 @@
#include
#include
-#include
+#include "regs-iis.h"
#include
#include "../codecs/wm8753.h"
diff --git a/arch/arm/plat-samsung/include/plat/regs-ac97.h
b/sound/soc/samsung/regs-ac97.h
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/regs-ac97.h
rename to sound/soc/samsung/regs-ac97.h
diff --git a/arch/arm/plat-samsung/include/plat/regs-iis.h
b/sound/soc/samsung/regs-iis.h
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/regs-iis.h
rename to sound/soc/samsung/regs-iis.h
diff --git a/sound/soc/samsung/rx1950_uda1380.c
b/sound/soc/samsung/rx1950_uda1380.c
index a5826ea..704460a 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -24,7 +24,7 @@
#include
#include
-#include
+#include "regs-iis.h"
#include
#include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 13f6dd1..a7b17c1 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -24,7 +24,7 @@
#include
#include
-#include
+#include "regs-iis.h"
#include "dma.h"
#include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c
b/sound/soc/samsung/s3c24xx_uda134x.c
index 333e1b7..1b7b52b 100644
--- a/sound/soc/samsung/s3c24xx_ud
