From: Huang Jiachai <hjc@rock-chips.com>
Date: Thu, 31 Mar 2016 07:05:38 +0000 (+0800)
Subject: video: rockchip: vop: 3399: update for iommu
X-Git-Tag: firefly_0821_release~2890
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5321f01c243f5716656c0d42d2300eaa6a4fe256;p=firefly-linux-kernel-4.4.55.git

video: rockchip: vop: 3399: update for iommu

Change-Id: Ic4550a2534fd016b6fff7e47f8d89ec239beba10
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
---

diff --git a/drivers/video/rockchip/lcdc/rk322x_lcdc.c b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
index 8f75e3c7d334..e8f03f882094 100644
--- a/drivers/video/rockchip/lcdc/rk322x_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
@@ -4786,8 +4786,19 @@ static int vop_probe(struct platform_device *pdev)
 			vop_dev->irq, ret);
 		return ret;
 	}
-	if (dev_drv->iommu_enabled)
-		strcpy(dev_drv->mmu_dts_name, VOP_IOMMU_COMPATIBLE_NAME);
+	if (dev_drv->iommu_enabled) {
+		if (VOP_CHIP(vop_dev) == VOP_RK322X) {
+			strcpy(dev_drv->mmu_dts_name,
+			       VOP_IOMMU_COMPATIBLE_NAME);
+		} else {
+			if (vop_dev->id == 0)
+				strcpy(dev_drv->mmu_dts_name,
+				       VOPB_IOMMU_COMPATIBLE_NAME);
+			else
+				strcpy(dev_drv->mmu_dts_name,
+				       VOPL_IOMMU_COMPATIBLE_NAME);
+		}
+	}
 	ret = rk_fb_register(dev_drv, vop_dev->data->win, vop_dev->id);
 	if (ret < 0) {
 		dev_err(dev, "register fb for lcdc%d failed!\n", vop_dev->id);