Commit 24f6173c authored by Stepan Moskovchenko's avatar Stepan Moskovchenko Committed by David Brown
Browse files

msm: iommu: Create a Kconfig item for the IOMMU driver 



Break the IOMMU driver out as a Kconfig item. Initially it
was decided to always build this in for 8x60, but this
driver is not strictly necessary and should be optionally
selectable.

Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent d056fca3

arch/arm/mach-msm/Kconfig

+12 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ config ARCH_MSM8X60 
	select CPU_V7

	select MSM_V2_TLMM

	select MSM_GPIOMUX

	select IOMMU_API

	select MSM_SCM if SMP



config ARCH_MSM8960
@@ -149,6 +148,18 @@ config MACH_MSM8960_RUMI3 


endmenu



config MSM_IOMMU

	bool "MSM IOMMU Support"

	depends on ARCH_MSM8X60

	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 ARCH_MSM8X60 && MMU && SMP && CPU_DCACHE_DISABLE=n

arch/arm/mach-msm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -4,11 +4,12 @@ obj-$(CONFIG_DEBUG_FS) += clock-debug.o 
endif



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

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



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

obj-$(CONFIG_ARCH_MSM7X30) += dma.o

obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o

obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o iommu.o iommu_dev.o devices-msm8x60-iommu.o

obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o devices-msm8x60-iommu.o

obj-$(CONFIG_ARCH_MSM8960) += clock-dummy.o



obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o