summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/mm.c
diff options
context:
space:
mode:
authorDong Aisheng <dong.aisheng@linaro.org>2012-05-04 20:12:18 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-05-12 13:32:18 +0800
commitcb1be3c73d273bfe74bd5a6fe80e6e84181283af (patch)
tree0e06a637b174b34eb581476bd902f031c48e80d4 /arch/arm/mach-mxs/mm.c
parent90c9abc5b74d7f7d8226b5dd0d8b6da3a03fe860 (diff)
downloadop-kernel-dev-cb1be3c73d273bfe74bd5a6fe80e6e84181283af.zip
op-kernel-dev-cb1be3c73d273bfe74bd5a6fe80e6e84181283af.tar.gz
ARM: mxs: do not add dma device by default
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> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm/mach-mxs/mm.c')
-rw-r--r--arch/arm/mach-mxs/mm.c6
1 files changed, 6 insertions, 0 deletions
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);
}
OpenPOWER on IntegriCloud