[PATCH 0/2] ARM: S3C24XX: Fix compilation errors with 3.6-rc1

Small fallout from from the s3c64xx spi changes and from a dma change from
last year, that only surfaced after a gcc update.

Heiko Stuebner (2):
  ARM: S3C24XX: Add missing DMACH_DT_PROP
  ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters

 arch/arm/mach-s3c24xx/include/mach/dma.h |    3 ++-
 arch/arm/plat-s3c24xx/dma.c              |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
1.7.2.3

Commit 2b90807549 (spi: s3c64xx: add device tree support) requires
the DMACH_DT_PROP element in the dma_ch enum. It's not used on non-DT
platforms but has to be present nevertheless.

So mimic the dummy-add of DMACH_DT_PROP on s3c64xx for s3c24xx
machines, to correct the build breakage for the s3c24xx variants
using the s3c64xx-spi-driver.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/mach-s3c24xx/include/mach/dma.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/include/mach/dma.h b/arch/arm/mach-s3c24xx/include/mach/dma.h
index 454831b..ee99fd5 100644
--- a/arch/arm/mach-s3c24xx/include/mach/dma.h
+++ b/arch/arm/mach-s3c24xx/include/mach/dma.h

@@ -24,7 +24,8 @@
 */
 
 enum dma_ch {
-	DMACH_XD0,
+	DMACH_DT_PROP = -1,	/* not yet supported, do not use */
+	DMACH_XD0 = 0,
 	DMACH_XD1,
 	DMACH_SDI,
 	DMACH_SPI0,

-- 
1.7.2.3

Commit d670ac019f60 (ARM: SAMSUNG: DMA Cleanup as per sparse) changed the
prototype of the s3c2410_dma_* functions to use the enum dma_ch instead
of an generic unsigned int.

In the s3c24xx dma.c s3c2410_dma_enqueue seems to have been forgotten,
the other functions there were changed correctly.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/plat-s3c24xx/dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 28f898f..db98e70 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c

@@ -430,7 +430,7 @@ s3c2410_dma_canload(struct s3c2410_dma_chan *chan)
  * when necessary.
 */
 
-int s3c2410_dma_enqueue(unsigned int channel, void *id,
+int s3c2410_dma_enqueue(enum dma_ch channel, void *id,
 			dma_addr_t data, int size)
 {
 	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);

-- 
1.7.2.3

Heiko St?bner wrote:

Small fallout from from the s3c64xx spi changes and from a dma change from
last year, that only surfaced after a gcc update.

Heiko Stuebner (2):
  ARM: S3C24XX: Add missing DMACH_DT_PROP
  ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters

 arch/arm/mach-s3c24xx/include/mach/dma.h |    3 ++-
 arch/arm/plat-s3c24xx/dma.c              |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--
1.7.2.3

Applied this series, thanks.

Best regards,
Kgene.
--
Kukjin Kim [off-list ref], Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.