aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorSimon Xue <xxm@rock-chips.com>2016-06-24 10:13:27 +0800
committerJoerg Roedel <jroedel@suse.de>2016-06-27 14:50:08 +0200
commite6d0f4737c468d1889aba06801c490988cf66ad7 (patch)
treed34a08795658657bec9b533fa376e46982bfa9d9 /drivers/iommu
parentiommu/rockchip: Fix devm_{request,free}_irq parameter (diff)
downloadlinux-dev-e6d0f4737c468d1889aba06801c490988cf66ad7.tar.xz
linux-dev-e6d0f4737c468d1889aba06801c490988cf66ad7.zip
iommu/rockchip: Add map_sg callback for rk_iommu_ops
The iommu_dma_alloc() in iommu/dma-iommu.c calls iommu_map_sg() that requires the callback iommu_ops .map_sg(). Adding the default_iommu_map_sg() to Rockchip IOMMU accordingly. Signed-off-by: Simon Xue <xxm@rock-chips.com> Signed-off-by: Shunqian Zheng <xxm@rock-chips.com> Reviewed-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Tomasz Figa <tfiga@chromium.org> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/rockchip-iommu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 5a9659a14e97..53fa0d939c9b 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1022,6 +1022,7 @@ static const struct iommu_ops rk_iommu_ops = {
.detach_dev = rk_iommu_detach_device,
.map = rk_iommu_map,
.unmap = rk_iommu_unmap,
+ .map_sg = default_iommu_map_sg,
.add_device = rk_iommu_add_device,
.remove_device = rk_iommu_remove_device,
.iova_to_phys = rk_iommu_iova_to_phys,