From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Thu, 31 Jul 2014 10:12:38 +0000 (+0300)
Subject: dmaengine: edma: Do not register second device when booted with DT
X-Git-Tag: v5.15~17417^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed64610f29414c0ea782bb6a462a3be72e7704dd;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 4190976..a13f37f 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);