From: Kukjin Kim <kgene.kim@samsung.com> To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Vinod Koul <vinod.koul@intel.com>, Dan Williams <dan.j.williams@intel.com>, Grant Likely <grant.likely@secretlab.ca>, Jassi Brar <jassisinghbrar@gmail.com>, Liam Girdwood <lrg@ti.com>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Boojin Kim <boojin.kim@samsung.com>, Kukjin Kim <kgene.kim@samsung.com> Subject: [PATCH 4/7] ARM: SAMSUNG: Update to use PL330-DMA driver Date: Mon, 4 Jul 2011 21:18:32 +0900 [thread overview] Message-ID: <1309781915-31549-5-git-send-email-kgene.kim@samsung.com> (raw) In-Reply-To: <1309781915-31549-1-git-send-email-kgene.kim@samsung.com> From: Boojin Kim <boojin.kim@samsung.com> This patch adds to support PL330-DMA driver on DMADEVICE. Currently S3C-DMA(PL080) is used for S3C24XX and S3C64XX and S3C-PL330-DMA has been used for S5P SoCs. So this patch changes S3C-PL330-DMA to just PL330-DMA for use generic DMA driver for S5P SoCs. Signed-off-by: Boojin Kim <boojin.kim@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> --- arch/arm/mach-exynos4/include/mach/dma.h | 4 ++-- arch/arm/mach-s5p64x0/include/mach/dma.h | 2 +- arch/arm/mach-s5pc100/include/mach/dma.h | 2 +- arch/arm/mach-s5pv210/include/mach/dma.h | 2 +- arch/arm/plat-samsung/Kconfig | 7 +++++++ .../include/plat/{s3c-dma-pl330.h => dma-pl330.h} | 18 +++++++++++++++--- .../plat-samsung/include/plat/s3c-pl330-pdata.h | 2 +- 7 files changed, 28 insertions(+), 9 deletions(-) rename arch/arm/plat-samsung/include/plat/{s3c-dma-pl330.h => dma-pl330.h} (87%) diff --git a/arch/arm/mach-exynos4/include/mach/dma.h b/arch/arm/mach-exynos4/include/mach/dma.h index 81209eb..201842a 100644 --- a/arch/arm/mach-exynos4/include/mach/dma.h +++ b/arch/arm/mach-exynos4/include/mach/dma.h @@ -20,7 +20,7 @@ #ifndef __MACH_DMA_H #define __MACH_DMA_H -/* This platform uses the common S3C DMA API driver for PL330 */ -#include <plat/s3c-dma-pl330.h> +/* This platform uses the common DMA API driver for PL330 */ +#include <plat/dma-pl330.h> #endif /* __MACH_DMA_H */ diff --git a/arch/arm/mach-s5p64x0/include/mach/dma.h b/arch/arm/mach-s5p64x0/include/mach/dma.h index 81209eb..1beae2c 100644 --- a/arch/arm/mach-s5p64x0/include/mach/dma.h +++ b/arch/arm/mach-s5p64x0/include/mach/dma.h @@ -21,6 +21,6 @@ #define __MACH_DMA_H /* This platform uses the common S3C DMA API driver for PL330 */ -#include <plat/s3c-dma-pl330.h> +#include <plat/dma-pl330.h> #endif /* __MACH_DMA_H */ diff --git a/arch/arm/mach-s5pc100/include/mach/dma.h b/arch/arm/mach-s5pc100/include/mach/dma.h index 81209eb..1beae2c 100644 --- a/arch/arm/mach-s5pc100/include/mach/dma.h +++ b/arch/arm/mach-s5pc100/include/mach/dma.h @@ -21,6 +21,6 @@ #define __MACH_DMA_H /* This platform uses the common S3C DMA API driver for PL330 */ -#include <plat/s3c-dma-pl330.h> +#include <plat/dma-pl330.h> #endif /* __MACH_DMA_H */ diff --git a/arch/arm/mach-s5pv210/include/mach/dma.h b/arch/arm/mach-s5pv210/include/mach/dma.h index 81209eb..1beae2c 100644 --- a/arch/arm/mach-s5pv210/include/mach/dma.h +++ b/arch/arm/mach-s5pv210/include/mach/dma.h @@ -21,6 +21,6 @@ #define __MACH_DMA_H /* This platform uses the common S3C DMA API driver for PL330 */ -#include <plat/s3c-dma-pl330.h> +#include <plat/dma-pl330.h> #endif /* __MACH_DMA_H */ diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 4d79519..4dc914e 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -300,6 +300,13 @@ config S3C_PL330_DMA help S3C DMA API Driver for PL330 DMAC. +config DMADEV_PL330 + bool + select DMADEVICES + select PL330_DMA + help + Use DMA device engine for PL330 DMAC. + comment "Power management" config SAMSUNG_PM_DEBUG diff --git a/arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h similarity index 87% rename from arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h rename to arch/arm/plat-samsung/include/plat/dma-pl330.h index 8107442..1122c8b 100644 --- a/arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h +++ b/arch/arm/plat-samsung/include/plat/dma-pl330.h @@ -8,11 +8,13 @@ * (at your option) any later version. */ -#ifndef __S3C_DMA_PL330_H_ -#define __S3C_DMA_PL330_H_ +#ifndef __DMA_PL330_H_ +#define __DMA_PL330_H_ __FILE__ +#if !defined(CONFIG_DMADEV_PL330) #define S3C2410_DMAF_AUTOSTART (1 << 0) #define S3C2410_DMAF_CIRCULAR (1 << 1) +#endif /* * PL330 can assign any channel to communicate with @@ -84,6 +86,14 @@ enum dma_ch { DMACH_SLIMBUS4_TX, DMACH_SLIMBUS5_RX, DMACH_SLIMBUS5_TX, + DMACH_MTOM_0, + DMACH_MTOM_1, + DMACH_MTOM_2, + DMACH_MTOM_3, + DMACH_MTOM_4, + DMACH_MTOM_5, + DMACH_MTOM_6, + DMACH_MTOM_7, /* END Marker, also used to denote a reserved channel */ DMACH_MAX, }; @@ -93,6 +103,8 @@ static inline bool s3c_dma_has_circular(void) return true; } +#if !defined(CONFIG_DMADEV_PL330) #include <plat/dma.h> +#endif -#endif /* __S3C_DMA_PL330_H_ */ +#endif /* __DMA_PL330_H_ */ diff --git a/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h b/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h index bf5e2a9..64fdf66 100644 --- a/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h +++ b/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h @@ -12,7 +12,7 @@ #ifndef __S3C_PL330_PDATA_H #define __S3C_PL330_PDATA_H -#include <plat/s3c-dma-pl330.h> +#include <plat/dma-pl330.h> /* * Every PL330 DMAC has max 32 peripheral interfaces, -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: kgene.kim@samsung.com (Kukjin Kim) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/7] ARM: SAMSUNG: Update to use PL330-DMA driver Date: Mon, 4 Jul 2011 21:18:32 +0900 [thread overview] Message-ID: <1309781915-31549-5-git-send-email-kgene.kim@samsung.com> (raw) In-Reply-To: <1309781915-31549-1-git-send-email-kgene.kim@samsung.com> From: Boojin Kim <boojin.kim@samsung.com> This patch adds to support PL330-DMA driver on DMADEVICE. Currently S3C-DMA(PL080) is used for S3C24XX and S3C64XX and S3C-PL330-DMA has been used for S5P SoCs. So this patch changes S3C-PL330-DMA to just PL330-DMA for use generic DMA driver for S5P SoCs. Signed-off-by: Boojin Kim <boojin.kim@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> --- arch/arm/mach-exynos4/include/mach/dma.h | 4 ++-- arch/arm/mach-s5p64x0/include/mach/dma.h | 2 +- arch/arm/mach-s5pc100/include/mach/dma.h | 2 +- arch/arm/mach-s5pv210/include/mach/dma.h | 2 +- arch/arm/plat-samsung/Kconfig | 7 +++++++ .../include/plat/{s3c-dma-pl330.h => dma-pl330.h} | 18 +++++++++++++++--- .../plat-samsung/include/plat/s3c-pl330-pdata.h | 2 +- 7 files changed, 28 insertions(+), 9 deletions(-) rename arch/arm/plat-samsung/include/plat/{s3c-dma-pl330.h => dma-pl330.h} (87%) diff --git a/arch/arm/mach-exynos4/include/mach/dma.h b/arch/arm/mach-exynos4/include/mach/dma.h index 81209eb..201842a 100644 --- a/arch/arm/mach-exynos4/include/mach/dma.h +++ b/arch/arm/mach-exynos4/include/mach/dma.h @@ -20,7 +20,7 @@ #ifndef __MACH_DMA_H #define __MACH_DMA_H -/* This platform uses the common S3C DMA API driver for PL330 */ -#include <plat/s3c-dma-pl330.h> +/* This platform uses the common DMA API driver for PL330 */ +#include <plat/dma-pl330.h> #endif /* __MACH_DMA_H */ diff --git a/arch/arm/mach-s5p64x0/include/mach/dma.h b/arch/arm/mach-s5p64x0/include/mach/dma.h index 81209eb..1beae2c 100644 --- a/arch/arm/mach-s5p64x0/include/mach/dma.h +++ b/arch/arm/mach-s5p64x0/include/mach/dma.h @@ -21,6 +21,6 @@ #define __MACH_DMA_H /* This platform uses the common S3C DMA API driver for PL330 */ -#include <plat/s3c-dma-pl330.h> +#include <plat/dma-pl330.h> #endif /* __MACH_DMA_H */ diff --git a/arch/arm/mach-s5pc100/include/mach/dma.h b/arch/arm/mach-s5pc100/include/mach/dma.h index 81209eb..1beae2c 100644 --- a/arch/arm/mach-s5pc100/include/mach/dma.h +++ b/arch/arm/mach-s5pc100/include/mach/dma.h @@ -21,6 +21,6 @@ #define __MACH_DMA_H /* This platform uses the common S3C DMA API driver for PL330 */ -#include <plat/s3c-dma-pl330.h> +#include <plat/dma-pl330.h> #endif /* __MACH_DMA_H */ diff --git a/arch/arm/mach-s5pv210/include/mach/dma.h b/arch/arm/mach-s5pv210/include/mach/dma.h index 81209eb..1beae2c 100644 --- a/arch/arm/mach-s5pv210/include/mach/dma.h +++ b/arch/arm/mach-s5pv210/include/mach/dma.h @@ -21,6 +21,6 @@ #define __MACH_DMA_H /* This platform uses the common S3C DMA API driver for PL330 */ -#include <plat/s3c-dma-pl330.h> +#include <plat/dma-pl330.h> #endif /* __MACH_DMA_H */ diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 4d79519..4dc914e 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -300,6 +300,13 @@ config S3C_PL330_DMA help S3C DMA API Driver for PL330 DMAC. +config DMADEV_PL330 + bool + select DMADEVICES + select PL330_DMA + help + Use DMA device engine for PL330 DMAC. + comment "Power management" config SAMSUNG_PM_DEBUG diff --git a/arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h similarity index 87% rename from arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h rename to arch/arm/plat-samsung/include/plat/dma-pl330.h index 8107442..1122c8b 100644 --- a/arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h +++ b/arch/arm/plat-samsung/include/plat/dma-pl330.h @@ -8,11 +8,13 @@ * (at your option) any later version. */ -#ifndef __S3C_DMA_PL330_H_ -#define __S3C_DMA_PL330_H_ +#ifndef __DMA_PL330_H_ +#define __DMA_PL330_H_ __FILE__ +#if !defined(CONFIG_DMADEV_PL330) #define S3C2410_DMAF_AUTOSTART (1 << 0) #define S3C2410_DMAF_CIRCULAR (1 << 1) +#endif /* * PL330 can assign any channel to communicate with @@ -84,6 +86,14 @@ enum dma_ch { DMACH_SLIMBUS4_TX, DMACH_SLIMBUS5_RX, DMACH_SLIMBUS5_TX, + DMACH_MTOM_0, + DMACH_MTOM_1, + DMACH_MTOM_2, + DMACH_MTOM_3, + DMACH_MTOM_4, + DMACH_MTOM_5, + DMACH_MTOM_6, + DMACH_MTOM_7, /* END Marker, also used to denote a reserved channel */ DMACH_MAX, }; @@ -93,6 +103,8 @@ static inline bool s3c_dma_has_circular(void) return true; } +#if !defined(CONFIG_DMADEV_PL330) #include <plat/dma.h> +#endif -#endif /* __S3C_DMA_PL330_H_ */ +#endif /* __DMA_PL330_H_ */ diff --git a/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h b/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h index bf5e2a9..64fdf66 100644 --- a/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h +++ b/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h @@ -12,7 +12,7 @@ #ifndef __S3C_PL330_PDATA_H #define __S3C_PL330_PDATA_H -#include <plat/s3c-dma-pl330.h> +#include <plat/dma-pl330.h> /* * Every PL330 DMAC has max 32 peripheral interfaces, -- 1.7.1
next prev parent reply other threads:[~2011-07-04 12:29 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-04 12:18 [PATCH 0/7] ARM: S5P: Use generic DMA APIs Kukjin Kim 2011-07-04 12:18 ` Kukjin Kim 2011-07-04 12:18 ` [PATCH 1/7] DMA: PL330: Add support runtime PM for PL330 DMAC Kukjin Kim 2011-07-04 12:18 ` Kukjin Kim 2011-07-05 6:11 ` Alim Akhtar 2011-07-05 6:11 ` Alim Akhtar 2011-07-05 7:26 ` Kukjin Kim 2011-07-05 7:26 ` Kukjin Kim 2011-07-05 8:04 ` Russell King - ARM Linux 2011-07-05 8:04 ` Russell King - ARM Linux 2011-07-08 10:18 ` Kukjin Kim 2011-07-08 10:18 ` Kukjin Kim 2011-07-04 12:18 ` [PATCH 2/7] DMA: PL330: Update PL330 DMA API driver Kukjin Kim 2011-07-04 12:18 ` Kukjin Kim 2011-07-05 7:36 ` Russell King - ARM Linux 2011-07-05 7:36 ` Russell King - ARM Linux 2011-07-08 7:57 ` Kukjin Kim 2011-07-08 7:57 ` Kukjin Kim 2011-07-04 12:18 ` [PATCH 3/7] DMA: PL330: Add DMA capabilities Kukjin Kim 2011-07-04 12:18 ` Kukjin Kim 2011-07-05 4:50 ` Chanho Park 2011-07-05 6:33 ` Chanho Park 2011-07-05 6:33 ` Chanho Park 2011-07-05 7:10 ` Kukjin Kim 2011-07-05 7:10 ` Kukjin Kim 2011-07-05 8:08 ` Chanho Park 2011-07-05 8:08 ` Chanho Park 2011-07-12 8:32 ` Jassi Brar 2011-07-12 8:32 ` Jassi Brar 2011-07-14 0:57 ` boojin 2011-07-14 0:57 ` boojin 2011-07-14 3:53 ` Jassi Brar 2011-07-14 3:53 ` Jassi Brar 2011-07-14 9:04 ` boojin 2011-07-14 9:04 ` boojin 2011-07-04 12:18 ` Kukjin Kim [this message] 2011-07-04 12:18 ` [PATCH 4/7] ARM: SAMSUNG: Update to use PL330-DMA driver Kukjin Kim 2011-07-04 12:18 ` [PATCH 5/7] ARM: EXYNOS4: Use generic DMA PL330 driver Kukjin Kim 2011-07-04 12:18 ` Kukjin Kim 2011-07-05 2:36 ` Chanho Park 2011-07-05 6:07 ` Alim Akhtar 2011-07-05 6:07 ` Alim Akhtar 2011-07-05 8:30 ` Sangwook Lee 2011-07-05 8:30 ` Sangwook Lee 2011-07-04 12:18 ` [PATCH 6/7] spi/s3c64xx: Add support DMA engine API Kukjin Kim 2011-07-04 12:18 ` Kukjin Kim 2011-07-04 16:42 ` Grant Likely 2011-07-04 16:42 ` Grant Likely 2011-07-04 16:56 ` Mark Brown 2011-07-04 16:56 ` Mark Brown 2011-07-04 16:59 ` Heiko Stübner 2011-07-04 16:59 ` Heiko Stübner 2011-07-04 17:02 ` Grant Likely 2011-07-04 17:02 ` Grant Likely 2011-07-04 19:51 ` Heiko Stübner 2011-07-04 19:51 ` Heiko Stübner 2011-07-04 23:27 ` Grant Likely 2011-07-04 23:27 ` Grant Likely 2011-07-05 7:05 ` Kukjin Kim 2011-07-05 7:05 ` Kukjin Kim 2011-07-05 7:53 ` Russell King - ARM Linux 2011-07-05 7:53 ` Russell King - ARM Linux 2011-07-05 10:51 ` Heiko Stübner 2011-07-05 10:51 ` Heiko Stübner 2011-07-05 11:16 ` Jassi Brar 2011-07-05 11:16 ` Jassi Brar 2011-07-05 11:27 ` Russell King - ARM Linux 2011-07-05 11:27 ` Russell King - ARM Linux 2011-07-05 11:45 ` Jassi Brar 2011-07-05 11:45 ` Jassi Brar 2011-07-08 9:26 ` Kukjin Kim 2011-07-08 9:26 ` Kukjin Kim 2011-07-05 7:48 ` Russell King - ARM Linux 2011-07-05 7:48 ` Russell King - ARM Linux 2011-07-05 8:39 ` Chanho Park 2011-07-05 8:39 ` Chanho Park 2011-07-04 12:18 ` [PATCH 7/7] ASoC: Samsung: Update DMA interface Kukjin Kim 2011-07-04 12:18 ` Kukjin Kim 2011-07-04 17:03 ` Mark Brown 2011-07-04 17:03 ` Mark Brown 2011-07-05 7:19 ` Kukjin Kim 2011-07-05 7:19 ` Kukjin Kim 2011-07-05 18:04 ` Grant Likely 2011-07-05 18:04 ` Grant Likely 2011-07-05 7:45 ` Seungwhan Youn 2011-07-05 7:45 ` Seungwhan Youn
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1309781915-31549-5-git-send-email-kgene.kim@samsung.com \ --to=kgene.kim@samsung.com \ --cc=boojin.kim@samsung.com \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=dan.j.williams@intel.com \ --cc=grant.likely@secretlab.ca \ --cc=jassisinghbrar@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=lrg@ti.com \ --cc=vinod.koul@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.