Commit fd8e2d4b authored by Suman Anna's avatar Suman Anna Committed by Joerg Roedel

omap3isp: Remove iommu_group related code

The OMAP IOMMU driver has added the support for IOMMU groups internally,
and the ISP device is automatically linked to the appropriate IOMMU group.
So, remove the explicit function calls that creates/deletes an iommu_group
and adds the ISP device to this group.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 28ae1e3e
...@@ -1943,30 +1943,13 @@ static void isp_detach_iommu(struct isp_device *isp) ...@@ -1943,30 +1943,13 @@ static void isp_detach_iommu(struct isp_device *isp)
{ {
arm_iommu_release_mapping(isp->mapping); arm_iommu_release_mapping(isp->mapping);
isp->mapping = NULL; isp->mapping = NULL;
iommu_group_remove_device(isp->dev);
} }
static int isp_attach_iommu(struct isp_device *isp) static int isp_attach_iommu(struct isp_device *isp)
{ {
struct dma_iommu_mapping *mapping; struct dma_iommu_mapping *mapping;
struct iommu_group *group;
int ret; int ret;
/* Create a device group and add the device to it. */
group = iommu_group_alloc();
if (IS_ERR(group)) {
dev_err(isp->dev, "failed to allocate IOMMU group\n");
return PTR_ERR(group);
}
ret = iommu_group_add_device(group, isp->dev);
iommu_group_put(group);
if (ret < 0) {
dev_err(isp->dev, "failed to add device to IPMMU group\n");
return ret;
}
/* /*
* Create the ARM mapping, used by the ARM DMA mapping core to allocate * Create the ARM mapping, used by the ARM DMA mapping core to allocate
* VAs. This will allocate a corresponding IOMMU domain. * VAs. This will allocate a corresponding IOMMU domain.
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/iommu.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/wait.h> #include <linux/wait.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment