ARM64: dts: rk3399: support more frequency for evb2

[firefly-linux-kernel-4.4.55.git] / drivers / iommu / rk-iommu.c

diff --git a/drivers/iommu/rk-iommu.c b/drivers/iommu/rk-iommu.c
index b3bb9f38b313512942e0ba2f24343c37376912ff..e2ae0d813cafd01357a0da4741ff4a06bd75a032 100644 (file)
--- a/drivers/iommu/rk-iommu.c
+++ b/drivers/iommu/rk-iommu.c
@@ -766,7 +766,7 @@ int rockchip_iommu_tlb_invalidate_global(struct device *dev)
 {
        unsigned long flags;
        struct iommu_drvdata *data = dev_get_drvdata(dev->archdata.iommu);
-       int ret;
+       int ret = 0;
 
        spin_lock_irqsave(&data->data_lock, flags);
 
@@ -1223,6 +1223,8 @@ static const struct of_device_id iommu_dt_ids[] = {
        { .compatible = HEVC_IOMMU_COMPATIBLE_NAME},
        { .compatible = VPU_IOMMU_COMPATIBLE_NAME},
        { .compatible = ISP_IOMMU_COMPATIBLE_NAME},
+       { .compatible = ISP0_IOMMU_COMPATIBLE_NAME},
+       { .compatible = ISP1_IOMMU_COMPATIBLE_NAME},
        { .compatible = VOP_IOMMU_COMPATIBLE_NAME},
        { .compatible = VDEC_IOMMU_COMPATIBLE_NAME},
        { /* end */ }