diff options
| author | Ohad Ben-Cohen <ohad@wizery.com> | 2011-06-01 22:46:12 (GMT) |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-08-26 09:46:00 (GMT) |
| commit | f626b52d4a568d4315cd152123ef2d1ea406def2 (patch) | |
| tree | 3592dfe99e9fd2713609cef9fbb8d0dfc8653a52 /drivers/media/video/omap3isp/ispvideo.c | |
| parent | fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff) | |
| download | linux-fsl-qoriq-f626b52d4a568d4315cd152123ef2d1ea406def2.tar.xz | |
omap: iommu: migrate to the generic IOMMU API
Migrate OMAP's iommu driver to the generic IOMMU API, so users can stay
generic, and any generic IOMMU functionality can be developed once
in the generic framework.
Migrate omap's iovmm (virtual memory manager) to the generic IOMMU API,
and adapt omap3isp as needed, so the latter won't break.
The plan is to eventually remove iovmm completely by replacing it
with the (upcoming) IOMMU-based DMA-API.
Tested on OMAP3 (with omap3isp) and OMAP4 (with rpmsg/remoteproc).
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/media/video/omap3isp/ispvideo.c')
| -rw-r--r-- | drivers/media/video/omap3isp/ispvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c index fd965ad..023b502 100644 --- a/drivers/media/video/omap3isp/ispvideo.c +++ b/drivers/media/video/omap3isp/ispvideo.c @@ -446,7 +446,7 @@ ispmmu_vmap(struct isp_device *isp, const struct scatterlist *sglist, int sglen) sgt->nents = sglen; sgt->orig_nents = sglen; - da = iommu_vmap(isp->iommu, 0, sgt, IOMMU_FLAG); + da = iommu_vmap(isp->domain, isp->iommu, 0, sgt, IOMMU_FLAG); if (IS_ERR_VALUE(da)) kfree(sgt); @@ -462,7 +462,7 @@ static void ispmmu_vunmap(struct isp_device *isp, dma_addr_t da) { struct sg_table *sgt; - sgt = iommu_vunmap(isp->iommu, (u32)da); + sgt = iommu_vunmap(isp->domain, isp->iommu, (u32)da); kfree(sgt); } |