Patchwork [5/6] ARM: mxs: do not add dma device by default

login
register
mail settings
Submitter Shawn Guo
Date May 7, 2012, 2:23 p.m.
Message ID <1336400595-12964-6-git-send-email-shawn.guo@linaro.org>
Download mbox | patch
Permalink /patch/157332/
State New
Headers show

Comments

Shawn Guo - May 7, 2012, 2:23 p.m.
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(-)
Marek Vasut - May 7, 2012, 11:40 p.m.
Dear Shawn Guo,

> 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>

Ok, I see (ref. 3/5) ... this is good then, screw those nitpicks

Acked-by: Marek Vasut <marex@denx.de>

> ---
>  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);
>  }

Patch

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);
 }