Commit fcf3a6ef authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by Joerg Roedel
Browse files

omap: iommu/iovmm: move to dedicated iommu folder 



Move OMAP's iommu drivers to the dedicated iommu drivers folder.

While OMAP's iovmm (virtual memory manager) driver does not strictly
belong to the iommu drivers folder, move it there as well, because
it's by no means OMAP-specific (in concept. technically it is still
coupled with OMAP's iommu).

Eventually, iovmm will be completely replaced with the generic,
iommu-based, dma-mapping API.

Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent f626b52d

arch/arm/plat-omap/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -132,20 +132,6 @@ config OMAP_MBOX_KFIFO_SIZE 
	  This can also be changed at runtime (via the mbox_kfifo_size

	  module parameter).



#can't be tristate; iommu api doesn't support un-registration

config OMAP_IOMMU

	bool

	select IOMMU_API



config OMAP_IOMMU_DEBUG

       tristate "Export OMAP IOMMU internals in DebugFS"

       depends on OMAP_IOMMU && DEBUG_FS

       help

         Select this to see extensive information about

         the internal state of OMAP IOMMU in debugfs.



         Say N unless you know you need this.



config OMAP_IOMMU_IVA2

	bool

arch/arm/plat-omap/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ obj-$(CONFIG_ARCH_OMAP3) += omap_device.o 
obj-$(CONFIG_ARCH_OMAP4) += omap_device.o



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

obj-$(CONFIG_OMAP_IOMMU) += iommu.o iovmm.o

obj-$(CONFIG_OMAP_IOMMU_DEBUG) += iommu-debug.o



obj-$(CONFIG_CPU_FREQ) += cpu-omap.o

obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o

drivers/iommu/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -107,4 +107,22 @@ config INTR_REMAP 
	  To use x2apic mode in the CPU's which support x2APIC enhancements or

	  to support platforms with CPU's having > 8 bit APIC ID, say Y.



# OMAP IOMMU support

config OMAP_IOMMU

	bool "OMAP IOMMU Support"

	select IOMMU_API



config OMAP_IOVMM

	tristate

	select OMAP_IOMMU



config OMAP_IOMMU_DEBUG

       tristate "Export OMAP IOMMU/IOVMM internals in DebugFS"

       depends on OMAP_IOVMM && DEBUG_FS

       help

         Select this to see extensive information about

         the internal state of OMAP IOMMU/IOVMM in debugfs.



         Say N unless you know you need this.



endif # IOMMU_SUPPORT

drivers/iommu/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -3,3 +3,6 @@ obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o 
obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o

obj-$(CONFIG_DMAR) += dmar.o iova.o intel-iommu.o

obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o

obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o

obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o

obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE