tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

authored by

Ohad Ben-Cohen and committed by
Joerg Roedel b10f127e ab493a0f

+18 -17
-16
arch/arm/mach-msm/Kconfig
··· 148 148 149 149 endmenu 150 150 151 - config MSM_IOMMU 152 - bool "MSM IOMMU Support" 153 - depends on ARCH_MSM8X60 || ARCH_MSM8960 154 - select IOMMU_API 155 - default n 156 - help 157 - Support for the IOMMUs found on certain Qualcomm SOCs. 158 - These IOMMUs allow virtualization of the address space used by most 159 - cores within the multimedia subsystem. 160 - 161 - If unsure, say N here. 162 - 163 - config IOMMU_PGTABLES_L2 164 - def_bool y 165 - depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n 166 - 167 151 config MSM_DEBUG_UART 168 152 int 169 153 default 1 if MSM_DEBUG_UART1
+1 -1
arch/arm/mach-msm/Makefile
··· 3 3 obj-$(CONFIG_DEBUG_FS) += clock-debug.o 4 4 5 5 obj-$(CONFIG_MSM_VIC) += irq-vic.o 6 - obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o 6 + obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o 7 7 8 8 obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o 9 9 obj-$(CONFIG_ARCH_MSM7X30) += dma.o
arch/arm/mach-msm/iommu.c drivers/iommu/msm_iommu.c
arch/arm/mach-msm/iommu_dev.c drivers/iommu/msm_iommu_dev.c
+16
drivers/iommu/Kconfig
··· 1 1 # IOMMU_API always gets selected by whoever wants it. 2 2 config IOMMU_API 3 3 bool 4 + 5 + # MSM IOMMU support 6 + config MSM_IOMMU 7 + bool "MSM IOMMU Support" 8 + depends on ARCH_MSM8X60 || ARCH_MSM8960 9 + select IOMMU_API 10 + help 11 + Support for the IOMMUs found on certain Qualcomm SOCs. 12 + These IOMMUs allow virtualization of the address space used by most 13 + cores within the multimedia subsystem. 14 + 15 + If unsure, say N here. 16 + 17 + config IOMMU_PGTABLES_L2 18 + def_bool y 19 + depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n
+1
drivers/iommu/Makefile
··· 1 1 obj-$(CONFIG_IOMMU_API) += iommu.o 2 + obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o