From ec801e81f6b5dfba32c0be93801fc785f7e962b2 Mon Sep 17 00:00:00 2001 From: Mark Yao Date: Mon, 11 Jul 2016 14:50:58 +0800 Subject: [PATCH] iommu/rockchip: fix old/new iommu driver conflict Change-Id: I22fcf6be63aebe76417a470975c6c10bbc3ed92a Signed-off-by: Mark Yao --- drivers/iommu/rk-iommu.c | 7 +++++++ 1 file changed, 7 insertions(+) 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); -- 2.34.1