From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/6] ARM: mxs: do not add dma device by default
Date: Mon, 7 May 2012 22:23:14 +0800 [thread overview]
Message-ID: <1336400595-12964-6-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1336400595-12964-1-git-send-email-shawn.guo@linaro.org>
From: Dong Aisheng <dong.aisheng@linaro.org>
This will cause conflict when dt is enabled.
So let each platform add dma devices respectively.
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Huang Shijie <b32955@freescale.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-mxs/devices/platform-dma.c | 23 +----------------------
arch/arm/mach-mxs/include/mach/common.h | 3 +++
arch/arm/mach-mxs/mm.c | 6 ++++++
3 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-mxs/devices/platform-dma.c b/arch/arm/mach-mxs/devices/platform-dma.c
index aff4813..4682450 100644
--- a/arch/arm/mach-mxs/devices/platform-dma.c
+++ b/arch/arm/mach-mxs/devices/platform-dma.c
@@ -14,7 +14,7 @@
#include <mach/mx28.h>
#include <mach/devices-common.h>
-static struct platform_device *__init mxs_add_dma(const char *devid,
+struct platform_device *__init mxs_add_dma(const char *devid,
resource_size_t base)
{
struct resource res[] = {
@@ -29,24 +29,3 @@ static struct platform_device *__init mxs_add_dma(const char *devid,
res, ARRAY_SIZE(res), NULL, 0,
DMA_BIT_MASK(32));
}
-
-static int __init mxs_add_mxs_dma(void)
-{
- char *mx23_apbh = "imx23-dma-apbh";
- char *mx23_apbx = "imx23-dma-apbx";
- char *mx28_apbh = "imx28-dma-apbh";
- char *mx28_apbx = "imx28-dma-apbx";
-
- if (cpu_is_mx23()) {
- mxs_add_dma(mx23_apbh, MX23_APBH_DMA_BASE_ADDR);
- mxs_add_dma(mx23_apbx, MX23_APBX_DMA_BASE_ADDR);
- }
-
- if (cpu_is_mx28()) {
- mxs_add_dma(mx28_apbh, MX28_APBH_DMA_BASE_ADDR);
- mxs_add_dma(mx28_apbx, MX28_APBX_DMA_BASE_ADDR);
- }
-
- return 0;
-}
-arch_initcall(mxs_add_mxs_dma);
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h
index 84af61c..5f9a358 100644
--- a/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@ -31,4 +31,7 @@ extern void mx28_init_irq(void);
extern void icoll_init_irq(void);
+extern struct platform_device *mxs_add_dma(const char *devid,
+ resource_size_t base);
+
#endif /* __MACH_MXS_COMMON_H__ */
diff --git a/arch/arm/mach-mxs/mm.c b/arch/arm/mach-mxs/mm.c
index 67a384e..6af4371 100644
--- a/arch/arm/mach-mxs/mm.c
+++ b/arch/arm/mach-mxs/mm.c
@@ -66,9 +66,15 @@ void __init mx28_init_irq(void)
void __init mx23_soc_init(void)
{
pinctrl_provide_dummies();
+
+ mxs_add_dma("imx23-dma-apbh", MX23_APBH_DMA_BASE_ADDR);
+ mxs_add_dma("imx23-dma-apbx", MX23_APBX_DMA_BASE_ADDR);
}
void __init mx28_soc_init(void)
{
pinctrl_provide_dummies();
+
+ mxs_add_dma("imx28-dma-apbh", MX23_APBH_DMA_BASE_ADDR);
+ mxs_add_dma("imx28-dma-apbx", MX23_APBX_DMA_BASE_ADDR);
}
--
1.7.5.4
next prev parent reply other threads:[~2012-05-07 14:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-07 14:23 [PATCH 0/6] Add device tree support for mxs-dma Shawn Guo
2012-05-07 14:23 ` [PATCH 1/6] dma: mxs-dma: use global stmp_device functionality Shawn Guo
2012-05-07 23:34 ` Marek Vasut
2012-05-07 14:23 ` [PATCH 2/6] dma: mxs-dma: let dma_is_apbh and apbh_is_old take parameter Shawn Guo
2012-05-07 23:37 ` Marek Vasut
2012-05-08 14:03 ` Shawn Guo
2012-05-09 8:40 ` Vinod Koul
2012-05-09 9:00 ` Marek Vasut
2012-05-09 9:02 ` Vinod Koul
2012-05-09 9:16 ` Marek Vasut
2012-05-09 9:32 ` Shawn Guo
2012-05-07 14:23 ` [PATCH 3/6] dma: mxs-dma: make platform_device_id more generic Shawn Guo
2012-05-07 23:38 ` Marek Vasut
2012-05-07 14:23 ` [PATCH 4/6] dma: mxs-dma: add device tree probe support Shawn Guo
2012-05-07 23:39 ` Marek Vasut
2012-05-07 14:23 ` Shawn Guo [this message]
2012-05-07 23:40 ` [PATCH 5/6] ARM: mxs: do not add dma device by default Marek Vasut
2012-05-07 14:23 ` [PATCH 6/6] ARM: mxs: add mxs-dma dt support Shawn Guo
2012-05-07 23:40 ` Marek Vasut
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=1336400595-12964-6-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).