From: Mark Yao <mark.yao@rock-chips.com>
Date: Mon, 11 Jul 2016 06:50:58 +0000 (+0800)
Subject: iommu/rockchip: fix old/new iommu driver conflict
X-Git-Tag: firefly_0821_release~2182
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=ec801e81f6b5dfba32c0be93801fc785f7e962b2

iommu/rockchip: fix old/new iommu driver conflict

Change-Id: I22fcf6be63aebe76417a470975c6c10bbc3ed92a
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---

diff --git a/drivers/iommu/rk-iommu.c b/drivers/iommu/rk-iommu.c
index e2ae0d813caf..d63bb6f54d64 100644
--- a/drivers/iommu/rk-iommu.c
+++ b/drivers/iommu/rk-iommu.c
@@ -1245,8 +1245,15 @@ static struct platform_driver rk_iommu_driver = {
 
 static int __init rockchip_iommu_init_driver(void)
 {
+	struct device_node *np;
 	int ret;
 
+	np = of_find_matching_node(NULL, iommu_dt_ids);
+	if (!np) {
+		pr_err("Failed to find legacy iommu devices\n");
+		return -ENODEV;
+	}
+
 	lv2table_kmem_cache = kmem_cache_create("rk-iommu-lv2table",
 						LV2TABLE_SIZE, LV2TABLE_SIZE,
 						0, NULL);