Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/media/platform/omap3isp/isp.c

+0 −17
Original line number Diff line number Diff line
@@ -1943,30 +1943,13 @@ static void isp_detach_iommu(struct isp_device *isp) 
{

	arm_iommu_release_mapping(isp->mapping);

	isp->mapping = NULL;

	iommu_group_remove_device(isp->dev);

}



static int isp_attach_iommu(struct isp_device *isp)

{

	struct dma_iommu_mapping *mapping;

	struct iommu_group *group;

	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

	 * VAs. This will allocate a corresponding IOMMU domain.

drivers/media/platform/omap3isp/isp.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/clk-provider.h>

#include <linux/device.h>

#include <linux/io.h>

#include <linux/iommu.h>

#include <linux/platform_device.h>

#include <linux/wait.h>