Merge branch develop-3.10 into develop-3.10-next

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

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 51fe7e0e5d8c48e6d9c4d3fea3d933ca0460f6d4..85e46a34b3a151baac1c72d23e3957f3b2e997b1 100755 (executable)
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -484,8 +484,12 @@ static bool rockchip_iommu_reset(void __iomem *base, const char *dbgname)
 
 static inline void rockchip_pgtable_flush(void *vastart, void *vaend)
 {
+#ifdef CONFIG_ARM
        dmac_flush_range(vastart, vaend);
        outer_flush_range(virt_to_phys(vastart), virt_to_phys(vaend));
+#elif defined(CONFIG_ARM64)
+       __dma_flush_range(vastart, vaend);
+#endif
 }
 
 static void dump_pagetbl(dma_addr_t fault_address, u32 addr_dte)