diff options
author | Tony Lindgren <tony@atomide.com> | 2013-01-11 19:24:19 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-01-11 19:24:19 (GMT) |
commit | be1f94812c2cc0aaf696d39fe23104763ea52b5b (patch) | |
tree | 2f9789af80ad91ad976a824548c0c2aa4d9b591f /drivers/dma/omap-dma.c | |
parent | a6cf912c6047077a6eb860ed8dbfa342376ee395 (diff) | |
download | linux-be1f94812c2cc0aaf696d39fe23104763ea52b5b.tar.xz |
ARM: OMAP: Fix dmaengine init for multiplatform
Otherwise omap dmaengine will initialized when booted
on other SoCs. Fix this by initializing the platform
device in arch/arm/*omap*/dma.c instead.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Dan Williams <djbw@fb.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/dma/omap-dma.c')
-rw-r--r-- | drivers/dma/omap-dma.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 5a31264..c4b4fd2 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -661,32 +661,14 @@ bool omap_dma_filter_fn(struct dma_chan *chan, void *param) } EXPORT_SYMBOL_GPL(omap_dma_filter_fn); -static struct platform_device *pdev; - -static const struct platform_device_info omap_dma_dev_info = { - .name = "omap-dma-engine", - .id = -1, - .dma_mask = DMA_BIT_MASK(32), -}; - static int omap_dma_init(void) { - int rc = platform_driver_register(&omap_dma_driver); - - if (rc == 0) { - pdev = platform_device_register_full(&omap_dma_dev_info); - if (IS_ERR(pdev)) { - platform_driver_unregister(&omap_dma_driver); - rc = PTR_ERR(pdev); - } - } - return rc; + return platform_driver_register(&omap_dma_driver); } subsys_initcall(omap_dma_init); static void __exit omap_dma_exit(void) { - platform_device_unregister(pdev); platform_driver_unregister(&omap_dma_driver); } module_exit(omap_dma_exit); |