diff options
| author | Tony Lindgren | 2012-11-02 20:24:06 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2012-11-20 19:04:41 +0100 |
| commit | ed1c7de29f9f3d56b3ca5ef69682cc1a3d369e9d (patch) | |
| tree | cd61bc6adacd14f97d12e51f43171bf0b685727f /drivers/iommu/omap-iopgtable.h | |
| parent | ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h (diff) | |
| download | kernel-qcow2-linux-ed1c7de29f9f3d56b3ca5ef69682cc1a3d369e9d.tar.gz kernel-qcow2-linux-ed1c7de29f9f3d56b3ca5ef69682cc1a3d369e9d.tar.xz kernel-qcow2-linux-ed1c7de29f9f3d56b3ca5ef69682cc1a3d369e9d.zip | |
ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
This file should not be in arch/arm. Move it to drivers/iommu
to allow making most of the header local to drivers/iommu.
This is needed as we are removing plat and mach includes
from drivers for ARM common zImage support.
Cc: Ido Yariv <ido@wizery.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Cc: linux-media@vger.kernel.org
Acked-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/iommu/omap-iopgtable.h')
| -rw-r--r-- | drivers/iommu/omap-iopgtable.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/iommu/omap-iopgtable.h b/drivers/iommu/omap-iopgtable.h index 66a813977d52..cd4ae9e5b0c6 100644 --- a/drivers/iommu/omap-iopgtable.h +++ b/drivers/iommu/omap-iopgtable.h @@ -10,9 +10,6 @@ * published by the Free Software Foundation. */ -#ifndef __PLAT_OMAP_IOMMU_H -#define __PLAT_OMAP_IOMMU_H - /* * "L2 table" address mask and size definitions. */ @@ -97,24 +94,5 @@ static inline phys_addr_t omap_iommu_translate(u32 d, u32 va, u32 mask) #define iopte_index(da) (((da) >> IOPTE_SHIFT) & (PTRS_PER_IOPTE - 1)) #define iopte_offset(iopgd, da) (iopgd_page_vaddr(iopgd) + iopte_index(da)) -static inline u32 iotlb_init_entry(struct iotlb_entry *e, u32 da, u32 pa, - u32 flags) -{ - memset(e, 0, sizeof(*e)); - - e->da = da; - e->pa = pa; - e->valid = 1; - /* FIXME: add OMAP1 support */ - e->pgsz = flags & MMU_CAM_PGSZ_MASK; - e->endian = flags & MMU_RAM_ENDIAN_MASK; - e->elsz = flags & MMU_RAM_ELSZ_MASK; - e->mixed = flags & MMU_RAM_MIXED_MASK; - - return iopgsz_to_bytes(e->pgsz); -} - #define to_iommu(dev) \ (struct omap_iommu *)platform_get_drvdata(to_platform_device(dev)) - -#endif /* __PLAT_OMAP_IOMMU_H */ |