tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: OMAP2+: Move iommu/iovmm headers to platform_data

Move iommu/iovmm headers from plat/ to platform_data/ as part of the
single zImage work.

Partially based on an earlier version by Ido Yariv <ido@wizery.com>.

Cc: Ido Yariv <ido@wizery.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Tony Lindgren 2ab7c848 7bd9e25f

+8 -11
+1 -1
arch/arm/mach-omap2/devices.c
··· 126 126 127 127 #if defined(CONFIG_IOMMU_API) 128 128 129 - #include <plat/iommu.h> 129 + #include <linux/platform_data/iommu-omap.h> 130 130 131 131 static struct resource omap3isp_resources[] = { 132 132 {
+1 -1
arch/arm/mach-omap2/omap-iommu.c
··· 13 13 #include <linux/module.h> 14 14 #include <linux/platform_device.h> 15 15 16 - #include <plat/iommu.h> 16 + #include <linux/platform_data/iommu-omap.h> 17 17 18 18 #include "soc.h" 19 19 #include "common.h"
+1 -1
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
··· 26 26 #include <plat/mmc.h> 27 27 #include <linux/platform_data/asoc-ti-mcbsp.h> 28 28 #include <linux/platform_data/spi-omap2-mcspi.h> 29 + #include <linux/platform_data/iommu-omap.h> 29 30 #include <plat/dmtimer.h> 30 - #include <plat/iommu.h> 31 31 32 32 #include "am35xx.h" 33 33
+1 -1
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
··· 27 27 #include <plat/dma.h> 28 28 #include <linux/platform_data/spi-omap2-mcspi.h> 29 29 #include <linux/platform_data/asoc-ti-mcbsp.h> 30 + #include <linux/platform_data/iommu-omap.h> 30 31 #include <plat/mmc.h> 31 32 #include <plat/dmtimer.h> 32 33 #include <plat/common.h> 33 - #include <plat/iommu.h> 34 34 35 35 #include "omap_hwmod_common_data.h" 36 36 #include "cm1_44xx.h"
arch/arm/plat-omap/include/plat/iommu.h include/linux/platform_data/iommu-omap.h
+1 -2
drivers/iommu/omap-iommu-debug.c
··· 19 19 #include <linux/platform_device.h> 20 20 #include <linux/debugfs.h> 21 21 #include <linux/omap-iommu.h> 22 - 23 - #include <plat/iommu.h> 22 + #include <linux/platform_data/iommu-omap.h> 24 23 25 24 #include "omap-iopgtable.h" 26 25 #include "omap-iommu.h"
+1 -1
drivers/iommu/omap-iommu.c
··· 26 26 27 27 #include <asm/cacheflush.h> 28 28 29 - #include <plat/iommu.h> 29 + #include <linux/platform_data/iommu-omap.h> 30 30 31 31 #include "omap-iopgtable.h" 32 32 #include "omap-iommu.h"
+1 -1
drivers/iommu/omap-iommu2.c
··· 19 19 #include <linux/omap-iommu.h> 20 20 #include <linux/slab.h> 21 21 #include <linux/stringify.h> 22 + #include <linux/platform_data/iommu-omap.h> 22 23 23 - #include <plat/iommu.h> 24 24 #include "omap-iommu.h" 25 25 26 26 /*
+1 -2
drivers/iommu/omap-iovmm.c
··· 18 18 #include <linux/scatterlist.h> 19 19 #include <linux/iommu.h> 20 20 #include <linux/omap-iommu.h> 21 + #include <linux/platform_data/iommu-omap.h> 21 22 22 23 #include <asm/cacheflush.h> 23 24 #include <asm/mach/map.h> 24 - 25 - #include <plat/iommu.h> 26 25 27 26 #include "omap-iopgtable.h" 28 27 #include "omap-iommu.h"
-1
drivers/media/platform/omap3isp/ispvideo.c
··· 35 35 #include <linux/vmalloc.h> 36 36 #include <media/v4l2-dev.h> 37 37 #include <media/v4l2-ioctl.h> 38 - #include <plat/iommu.h> 39 38 #include <plat/omap-pm.h> 40 39 41 40 #include "ispvideo.h"