Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

msm: iommu: move to drivers/iommu/ 



This should ease finding similarities with different platforms,
with the intention of solving problems once in a generic framework
which everyone can use.

Compile-tested for MSM8X60.

Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent ab493a0f

arch/arm/mach-msm/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -148,22 +148,6 @@ config MACH_MSM8960_RUMI3 


endmenu



config MSM_IOMMU

	bool "MSM IOMMU Support"

	depends on ARCH_MSM8X60 || ARCH_MSM8960

	select IOMMU_API

	default n

	help

	  Support for the IOMMUs found on certain Qualcomm SOCs.

	  These IOMMUs allow virtualization of the address space used by most

	  cores within the multimedia subsystem.



	  If unsure, say N here.



config IOMMU_PGTABLES_L2

	def_bool y

	depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n



config MSM_DEBUG_UART

	int

	default 1 if MSM_DEBUG_UART1

arch/arm/mach-msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-y += clock.o 
obj-$(CONFIG_DEBUG_FS) += clock-debug.o



obj-$(CONFIG_MSM_VIC) += irq-vic.o

obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o

obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o



obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o

obj-$(CONFIG_ARCH_MSM7X30) += dma.o

drivers/iommu/Kconfig

+16 −0
Original line number Diff line number Diff line 
# IOMMU_API always gets selected by whoever wants it.

config IOMMU_API

	bool



# MSM IOMMU support

config MSM_IOMMU

	bool "MSM IOMMU Support"

	depends on ARCH_MSM8X60 || ARCH_MSM8960

	select IOMMU_API

	help

	  Support for the IOMMUs found on certain Qualcomm SOCs.

	  These IOMMUs allow virtualization of the address space used by most

	  cores within the multimedia subsystem.



	  If unsure, say N here.



config IOMMU_PGTABLES_L2

	def_bool y

	depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n

drivers/iommu/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_IOMMU_API) += iommu.o

obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o

arch/arm/mach-msm/iommu.c→drivers/iommu/msm_iommu.c

+0 −0

File moved.

View file