Hi all,
Here's this one again fixed with the issues Laurent noticed.
Regards,
Tony
---
Ido Yariv (3):
ARM: OMAP: Merge iommu2.h into iommu.h
ARM: OMAP2+: Move iopgtable header to drivers/iommu/
ARM: OMAP2+: Make some definitions local
Tony Lindgren (3):
ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
ARM: OMAP2+: Move iommu/iovmm headers to platform_data
arch/arm/mach-omap2/Makefile | 2
arch/arm/mach-omap2/devices.c | 2
arch/arm/mach-omap2/omap-iommu.c | 2
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2
arch/arm/plat-omap/include/plat/iommu2.h | 96 -------------------
arch/arm/plat-omap/include/plat/iovmm.h | 89 ------------------
drivers/iommu/Makefile | 1
drivers/iommu/omap-iommu-debug.c | 8 +-
drivers/iommu/omap-iommu.c | 39 ++++++++
drivers/iommu/omap-iommu.h | 133 ++++++++++++++-------------
drivers/iommu/omap-iommu2.c | 11 ++
drivers/iommu/omap-iopgtable.h | 22 ----
drivers/iommu/omap-iovmm.c | 50 ++++++++++
drivers/media/platform/omap3isp/isp.c | 1
drivers/media/platform/omap3isp/isp.h | 2
drivers/media/platform/omap3isp/ispccdc.c | 1
drivers/media/platform/omap3isp/ispstat.c | 1
drivers/media/platform/omap3isp/ispvideo.c | 3 -
include/linux/omap-iommu.h | 47 ++++++++++
include/linux/platform_data/iommu-omap.h | 49 ++++++++++
21 files changed, 273 insertions(+), 290 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/iommu2.h
delete mode 100644 arch/arm/plat-omap/include/plat/iovmm.h
rename arch/arm/plat-omap/include/plat/iommu.h => drivers/iommu/omap-iommu.h (69%)
rename arch/arm/mach-omap2/iommu2.c => drivers/iommu/omap-iommu2.c (96%)
rename arch/arm/plat-omap/include/plat/iopgtable.h => drivers/iommu/omap-iopgtable.h (85%)
create mode 100644 include/linux/omap-iommu.h
create mode 100644 include/linux/platform_data/iommu-omap.h
--
Signature
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
