diff options
| author |   Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-07-31 13:12:38 +0300 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@intel.com> | 2014-07-31 17:27:47 +0530 |
| commit | ed64610f29414c0ea782bb6a462a3be72e7704dd (patch) | |
| tree | c60b242a71c23bd2b6d2c28492026637646a5f2c /drivers/dma/edma.c | |
| parent | dmaengine: edma: Do not change the error code returned from edma_alloc_slot (diff) | |
| download | linux-dev-ed64610f29414c0ea782bb6a462a3be72e7704dd.tar.xz linux-dev-ed64610f29414c0ea782bb6a462a3be72e7704dd.zip | |
dmaengine: edma: Do not register second device when booted with DT
DT boot does not yet support more than one edma device. To avoid issues at
runtime we should not register the second device when the kernel is booted
with DT.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/edma.c')
| -rw-r--r-- | drivers/dma/edma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 4190976ababc..a13f37f719ed 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -23,6 +23,7 @@ #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/of.h> #include <linux/platform_data/edma.h> @@ -1132,7 +1133,7 @@ static int edma_init(void) } } - if (EDMA_CTLRS == 2) { + if (!of_have_populated_dt() && EDMA_CTLRS == 2) { pdev1 = platform_device_register_full(&edma_dev_info1); if (IS_ERR(pdev1)) { platform_driver_unregister(&edma_driver); |