* [PATCH 0/2] ARM: S3C24XX: Fix compilation errors with 3.6-rc1
@ 2012-08-05 15:38 ` Heiko Stübner
0 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2012-08-05 15:38 UTC (permalink / raw)
To: kgene.kim; +Cc: linux-samsung-soc, linux-arm-kernel
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] ARM: S3C24XX: Fix compilation errors with 3.6-rc1
@ 2012-08-05 15:38 ` Heiko Stübner
0 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2012-08-05 15:38 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: S3C24XX: Add missing DMACH_DT_PROP
2012-08-05 15:38 ` Heiko Stübner
@ 2012-08-05 15:39 ` Heiko Stübner
-1 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2012-08-05 15:39 UTC (permalink / raw)
To: kgene.kim; +Cc: linux-samsung-soc, linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: S3C24XX: Add missing DMACH_DT_PROP
@ 2012-08-05 15:39 ` Heiko Stübner
0 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2012-08-05 15:39 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters
2012-08-05 15:38 ` Heiko Stübner
@ 2012-08-05 15:39 ` Heiko Stübner
-1 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2012-08-05 15:39 UTC (permalink / raw)
To: kgene.kim; +Cc: linux-samsung-soc, linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters
@ 2012-08-05 15:39 ` Heiko Stübner
0 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2012-08-05 15:39 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* RE: [PATCH 0/2] ARM: S3C24XX: Fix compilation errors with 3.6-rc1
2012-08-05 15:38 ` Heiko Stübner
@ 2012-08-07 10:37 ` Kukjin Kim
-1 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2012-08-07 10:37 UTC (permalink / raw)
To: 'Heiko Stübner'; +Cc: linux-samsung-soc, linux-arm-kernel
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 <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] ARM: S3C24XX: Fix compilation errors with 3.6-rc1
@ 2012-08-07 10:37 ` Kukjin Kim
0 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2012-08-07 10:37 UTC (permalink / raw)
To: linux-arm-kernel
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 <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-08-07 10:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-05 15:38 [PATCH 0/2] ARM: S3C24XX: Fix compilation errors with 3.6-rc1 Heiko Stübner
2012-08-05 15:38 ` Heiko Stübner
2012-08-05 15:39 ` [PATCH 1/2] ARM: S3C24XX: Add missing DMACH_DT_PROP Heiko Stübner
2012-08-05 15:39 ` Heiko Stübner
2012-08-05 15:39 ` [PATCH 2/2] ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters Heiko Stübner
2012-08-05 15:39 ` Heiko Stübner
2012-08-07 10:37 ` [PATCH 0/2] ARM: S3C24XX: Fix compilation errors with 3.6-rc1 Kukjin Kim
2012-08-07 10:37 ` Kukjin Kim
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.