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

Commit 24313113 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

media: omap3isp: Allow it to build with COMPILE_TEST 



There aren't much things required for it to build with COMPILE_TEST.
It just needs to not compile the code that depends on arm-specific
iommu implementation.

Co-developed-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ba37e6dd

drivers/media/platform/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -63,12 +63,10 @@ config VIDEO_MUX 
config VIDEO_OMAP3

	tristate "OMAP 3 Camera support"

	depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API

	depends on ARCH_OMAP3 || COMPILE_TEST

	depends on ARM

	depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST

	depends on COMMON_CLK

	depends on HAS_DMA && OF

	depends on OMAP_IOMMU

	select ARM_DMA_USE_IOMMU

	select ARM_DMA_USE_IOMMU if OMAP_IOMMU

	select VIDEOBUF2_DMA_CONTIG

	select MFD_SYSCON

	select V4L2_FWNODE

drivers/media/platform/omap3isp/isp.c

+8 −0
Original line number Diff line number Diff line
@@ -61,7 +61,9 @@ 
#include <linux/sched.h>

#include <linux/vmalloc.h>



#ifdef CONFIG_ARM_DMA_USE_IOMMU

#include <asm/dma-iommu.h>

#endif



#include <media/v4l2-common.h>

#include <media/v4l2-fwnode.h>
@@ -1938,13 +1940,16 @@ static int isp_initialize_modules(struct isp_device *isp) 


static void isp_detach_iommu(struct isp_device *isp)

{

#ifdef CONFIG_ARM_DMA_USE_IOMMU

	arm_iommu_detach_device(isp->dev);

	arm_iommu_release_mapping(isp->mapping);

	isp->mapping = NULL;

#endif

}



static int isp_attach_iommu(struct isp_device *isp)

{

#ifdef CONFIG_ARM_DMA_USE_IOMMU

	struct dma_iommu_mapping *mapping;

	int ret;
@@ -1973,6 +1978,9 @@ static int isp_attach_iommu(struct isp_device *isp) 
	arm_iommu_release_mapping(isp->mapping);

	isp->mapping = NULL;

	return ret;

#else

	return -ENODEV;

#endif

}



/*