[PATCH 3/6] ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
From: laurent.pinchart@ideasonboard.com (Laurent Pinchart)
Date: 2012-10-24 23:52:42
Also in:
linux-media, linux-omap
Hi Tony, On Wednesday 24 October 2012 15:34:12 Tony Lindgren wrote:
* Laurent Pinchart [off-list ref] [121019 02:41]:quoted
On Thursday 18 October 2012 13:28:42 Tony Lindgren wrote:quoted
--- a/arch/arm/mach-omap2/iommu2.c +++ b/arch/arm/mach-omap2/iommu2.c@@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/stringify.h> +#include <linux/omap-iommu.h>Nitpicking, please keep the headers sorted alphabetically, here and in all locations below (especially the OMAP3 ISP driver). (OK, there's already one misplaced #include, but let's not make it worse :-))This is fixed now.quoted
quoted
--- /dev/null +++ b/include/linux/omap-iommu.h@@ -0,0 +1,47 @@ +/* + * omap iommu: simple virtual address space management + * + * Copyright (C) 2008-2009 Nokia Corporation + * + * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */Missing #ifndef #define ... #endifI've added it as _OMAP_IOMMU_H_, looks like both intel-iommu.h and amd-iommu.h have it. Hopefully that's OK for you as a base to do further iommu patches on, updated patch below. BTW, doing a test compile on v3.7-rc2, I'm seeing the following warnings for omap3isp for isp_video_ioctl_ops: drivers/media/platform/omap3isp/ispvideo.c:1213: warning: initialization from incompatible pointer type drivers/media/platform/omap3isp/ispccdc.c:2303: warning: initialization from incompatible pointer type drivers/media/platform/omap3isp/ispccdc.c:2304: warning: initialization from incompatible pointer type drivers/media/platform/omap3isp/isph3a_aewb.c:282: warning: initialization from incompatible pointer type drivers/media/platform/omap3isp/isph3a_aewb.c:283: warning: initialization from incompatible pointer type drivers/media/platform/omap3isp/isph3a_af.c:347: warning: initialization from incompatible pointer type drivers/media/platform/omap3isp/isph3a_af.c:348: warning: initialization from incompatible pointer type drivers/media/platform/omap3isp/isphist.c:453: warning: initialization from incompatible pointer type drivers/media/platform/omap3isp/isphist.c:454: warning: initialization from incompatible pointer type
I've just sent a pull request to linux-media for v3.7 with fixes for those. -- Regards, Laurent Pinchart