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 8f75e3c7d33456eba3e0b0d51903e6f6eb5a6a99..e8f03f882094697afe88c24b27e6b3a5c2690a04 100644 (file)
--- 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);