From: marex@denx.de (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/5] ARM: mxs: do not add dma device by default
Date: Wed, 18 Apr 2012 20:03:26 +0200 [thread overview]
Message-ID: <201204182003.26359.marex@denx.de> (raw)
In-Reply-To: <1334753197-12032-5-git-send-email-b29396@freescale.com>
Dear Dong Aisheng,
> From: Dong Aisheng <dong.aisheng@linaro.org>
>
> This will cause conflict when dt is enabled.
> So let each platform add dma devices respectively.
>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Huang Shijie <b32955@freescale.com>
> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
Reviewed-by: Marek Vasut <marex@denx.de>
> ---
> arch/arm/mach-mxs/devices-mx23.h | 2 ++
> arch/arm/mach-mxs/devices-mx28.h | 2 ++
> arch/arm/mach-mxs/devices/platform-dma.c | 3 +--
> arch/arm/mach-mxs/include/mach/devices-common.h | 3 +++
> arch/arm/mach-mxs/mach-apx4devkit.c | 1 +
> arch/arm/mach-mxs/mach-m28evk.c | 1 +
> arch/arm/mach-mxs/mach-mx23evk.c | 1 +
> arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 +
> arch/arm/mach-mxs/mach-tx28.c | 1 +
> 9 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mxs/devices-mx23.h
> b/arch/arm/mach-mxs/devices-mx23.h index 4d1329d..5fc6b50 100644
> --- a/arch/arm/mach-mxs/devices-mx23.h
> +++ b/arch/arm/mach-mxs/devices-mx23.h
> @@ -35,3 +35,5 @@ struct platform_device *__init mx23_add_mxsfb(
> const struct mxsfb_platform_data *pdata);
>
> struct platform_device *__init mx23_add_rtc_stmp3xxx(void);
> +
> +#define mx23_add_dma() mxs_add_mxs_dma()
> diff --git a/arch/arm/mach-mxs/devices-mx28.h
> b/arch/arm/mach-mxs/devices-mx28.h index 9dbeae1..0b3a62d 100644
> --- a/arch/arm/mach-mxs/devices-mx28.h
> +++ b/arch/arm/mach-mxs/devices-mx28.h
> @@ -55,3 +55,5 @@ extern const struct mxs_saif_data mx28_saif_data[]
> __initconst; mxs_add_saif(&mx28_saif_data[id], pdata)
>
> struct platform_device *__init mx28_add_rtc_stmp3xxx(void);
> +
> +#define mx28_add_dma() mxs_add_mxs_dma()
> diff --git a/arch/arm/mach-mxs/devices/platform-dma.c
> b/arch/arm/mach-mxs/devices/platform-dma.c index aff4813..d0126ea 100644
> --- a/arch/arm/mach-mxs/devices/platform-dma.c
> +++ b/arch/arm/mach-mxs/devices/platform-dma.c
> @@ -30,7 +30,7 @@ static struct platform_device *__init mxs_add_dma(const
> char *devid, DMA_BIT_MASK(32));
> }
>
> -static int __init mxs_add_mxs_dma(void)
> +int __init mxs_add_mxs_dma(void)
> {
> char *mx23_apbh = "imx23-dma-apbh";
> char *mx23_apbx = "imx23-dma-apbx";
> @@ -49,4 +49,3 @@ static int __init mxs_add_mxs_dma(void)
>
> return 0;
> }
> -arch_initcall(mxs_add_mxs_dma);
> diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h
> b/arch/arm/mach-mxs/include/mach/devices-common.h index f2e3839..544b38d
> 100644
> --- a/arch/arm/mach-mxs/include/mach/devices-common.h
> +++ b/arch/arm/mach-mxs/include/mach/devices-common.h
> @@ -116,3 +116,6 @@ struct mxs_saif_data {
> struct platform_device *__init mxs_add_saif(
> const struct mxs_saif_data *data,
> const struct mxs_saif_platform_data *pdata);
> +
> +/* dma */
> +int __init mxs_add_mxs_dma(void);
> diff --git a/arch/arm/mach-mxs/mach-apx4devkit.c
> b/arch/arm/mach-mxs/mach-apx4devkit.c index 48a7fab..92f47e9 100644
> --- a/arch/arm/mach-mxs/mach-apx4devkit.c
> +++ b/arch/arm/mach-mxs/mach-apx4devkit.c
> @@ -210,6 +210,7 @@ static void __init apx4devkit_init(void)
> mxs_iomux_setup_multiple_pads(apx4devkit_pads,
> ARRAY_SIZE(apx4devkit_pads));
>
> + mx28_add_dma();
> mx28_add_duart();
> mx28_add_auart0();
> mx28_add_auart1();
> diff --git a/arch/arm/mach-mxs/mach-m28evk.c
> b/arch/arm/mach-mxs/mach-m28evk.c index 06d7996..9a74ce6 100644
> --- a/arch/arm/mach-mxs/mach-m28evk.c
> +++ b/arch/arm/mach-mxs/mach-m28evk.c
> @@ -321,6 +321,7 @@ static void __init m28evk_init(void)
> {
> mxs_iomux_setup_multiple_pads(m28evk_pads, ARRAY_SIZE(m28evk_pads));
>
> + mx28_add_dma();
> mx28_add_duart();
> mx28_add_auart0();
> mx28_add_auart3();
> diff --git a/arch/arm/mach-mxs/mach-mx23evk.c
> b/arch/arm/mach-mxs/mach-mx23evk.c index 5ea1c57..cabc884 100644
> --- a/arch/arm/mach-mxs/mach-mx23evk.c
> +++ b/arch/arm/mach-mxs/mach-mx23evk.c
> @@ -143,6 +143,7 @@ static void __init mx23evk_init(void)
>
> mxs_iomux_setup_multiple_pads(mx23evk_pads, ARRAY_SIZE(mx23evk_pads));
>
> + mx23_add_dma();
> mx23_add_duart();
> mx23_add_auart0();
>
> diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c
> b/arch/arm/mach-mxs/mach-stmp378x_devb.c index a626c07..a391b9e 100644
> --- a/arch/arm/mach-mxs/mach-stmp378x_devb.c
> +++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c
> @@ -88,6 +88,7 @@ static void __init stmp378x_dvb_init(void)
> mxs_iomux_setup_multiple_pads(stmp378x_dvb_pads,
> ARRAY_SIZE(stmp378x_dvb_pads));
>
> + mx23_add_dma();
> mx23_add_duart();
> mx23_add_auart0();
> mx23_add_rtc_stmp3xxx();
> diff --git a/arch/arm/mach-mxs/mach-tx28.c b/arch/arm/mach-mxs/mach-tx28.c
> index 2c0862e..e17e262 100644
> --- a/arch/arm/mach-mxs/mach-tx28.c
> +++ b/arch/arm/mach-mxs/mach-tx28.c
> @@ -149,6 +149,7 @@ static void __init tx28_stk5v3_init(void)
> mxs_iomux_setup_multiple_pads(tx28_stk5v3_pads,
> ARRAY_SIZE(tx28_stk5v3_pads));
>
> + mx28_add_dma();
> mx28_add_duart(); /* UART1 */
> mx28_add_auart(1); /* UART2 */
Best regards,
Marek Vasut
next prev parent reply other threads:[~2012-04-18 18:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-18 12:46 [PATCH 0/5] dma: mxs-dma: make driver mach-independent and add dt support Dong Aisheng
2012-04-18 12:46 ` [PATCH 1/5] dma: mxs-dma: use global stmp_device functionality Dong Aisheng
2012-04-18 18:00 ` Marek Vasut
2012-04-18 12:46 ` [PATCH 2/5] dma: mxs-dma: make platform_device_id more generic Dong Aisheng
2012-04-18 18:01 ` Marek Vasut
2012-04-23 3:01 ` Shawn Guo
2012-04-23 3:58 ` Dong Aisheng
2012-04-23 4:58 ` Shawn Guo
2012-04-18 12:46 ` [PATCH 3/5] dma: mxs-dma: add device tree probe support Dong Aisheng
2012-04-18 18:02 ` Marek Vasut
2012-04-23 3:15 ` Shawn Guo
2012-04-23 4:01 ` Dong Aisheng
2012-04-23 5:04 ` Shawn Guo
2012-04-23 8:02 ` Dong Aisheng
2012-04-18 12:46 ` [PATCH 4/5] ARM: mxs: do not add dma device by default Dong Aisheng
2012-04-18 18:03 ` Marek Vasut [this message]
2012-04-20 15:11 ` [PATCH v2 " Dong Aisheng
2012-04-23 1:59 ` [PATCH " Shawn Guo
2012-04-23 3:26 ` Dong Aisheng
2012-04-18 12:46 ` [PATCH 5/5] ARM: mx28evk: add mxs-dma dt support Dong Aisheng
2012-04-18 18:03 ` 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=201204182003.26359.marex@denx.de \
--to=marex@denx.de \
--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).