diff options
author | Jon Hunter <jon-hunter@ti.com> | 2013-02-26 13:27:24 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2013-04-15 00:21:19 -0400 |
commit | 8d30662aac256eb61bc2f1d9cf1191825ef96328 (patch) | |
tree | fd39f755ea7cd13fbc79e2d3b06310caf2f07c62 /arch/arm/mach-omap2/dma.c | |
parent | f5b9b77eea1f9aaf7725872be4b382f5530bb41e (diff) |
dmaengine: OMAP: Register SDMA controller with Device Tree DMA driver
If the device-tree blob is present during boot, then register the SDMA
controller with the device-tree DMA driver so that we can use device-tree
to look-up DMA client information.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm/mach-omap2/dma.c')
-rw-r--r-- | arch/arm/mach-omap2/dma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c index dab9fc014b97..49fd0d501c9b 100644 --- a/arch/arm/mach-omap2/dma.c +++ b/arch/arm/mach-omap2/dma.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
29 | #include <linux/device.h> | 29 | #include <linux/device.h> |
30 | #include <linux/dma-mapping.h> | 30 | #include <linux/dma-mapping.h> |
31 | #include <linux/of.h> | ||
31 | #include <linux/omap-dma.h> | 32 | #include <linux/omap-dma.h> |
32 | 33 | ||
33 | #include "soc.h" | 34 | #include "soc.h" |
@@ -304,6 +305,9 @@ static int __init omap2_system_dma_init(void) | |||
304 | if (res) | 305 | if (res) |
305 | return res; | 306 | return res; |
306 | 307 | ||
308 | if (of_have_populated_dt()) | ||
309 | return res; | ||
310 | |||
307 | pdev = platform_device_register_full(&omap_dma_dev_info); | 311 | pdev = platform_device_register_full(&omap_dma_dev_info); |
308 | if (IS_ERR(pdev)) | 312 | if (IS_ERR(pdev)) |
309 | return PTR_ERR(pdev); | 313 | return PTR_ERR(pdev); |