On 04/19/18 13:15, Mauro Carvalho Chehab wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> 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.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> Co-developed-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
> Acked-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
Regards,
Hans
> ---
> drivers/media/platform/Kconfig | 6 ++----
> drivers/media/platform/omap3isp/isp.c | 8 ++++++++
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index 1ee915b794c0..e3229f7baed1 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index 16c50099cccd..b8c8761a76b6 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -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,12 +1940,15 @@ 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_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;
>
> @@ -1972,6 +1977,9 @@ static int isp_attach_iommu(struct isp_device *isp)
> error:
> isp_detach_iommu(isp);
> return ret;
> +#else
> + return -ENODEV;
> +#endif
> }
>
> /*
>
