Commit 8f02f363 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-drivers-move-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull iommu driver directory structure cleanup from Joerg Roedel:
 "Move the Intel and AMD IOMMU drivers into their own subdirectory.

  Both drivers consist of several files by now and giving them their own
  directory unclutters the IOMMU top-level directory a bit"

* tag 'iommu-drivers-move-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/vt-d: Move Intel IOMMU driver into subdirectory
  iommu/amd: Move AMD IOMMU driver into subdirectory
parents 5c2fb57a 672cf6df

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ M: Joerg Roedel <joro@8bytes.org> 
L:	iommu@lists.linux-foundation.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git

F:	drivers/iommu/amd_iommu*.[ch]

F:	drivers/iommu/amd/

F:	include/linux/amd-iommu.h















AMD KFD










@@ -8735,8 +8735,7 @@ M:	Lu Baolu <baolu.lu@linux.intel.com>













L:	iommu@lists.linux-foundation.org















S:	Supported















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git













F:	drivers/iommu/dmar.c













F:	drivers/iommu/intel*.[ch]













F:	drivers/iommu/intel/















F:	include/linux/intel-iommu.h















F:	include/linux/intel-svm.h















































drivers/iommu/Makefile



+9
−9






























Original line number
Diff line number
Diff line








@@ -11,19 +11,19 @@ obj-$(CONFIG_IOASID) += ioasid.o













obj-$(CONFIG_IOMMU_IOVA) += iova.o















obj-$(CONFIG_OF_IOMMU)	+= of_iommu.o















obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o













obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o













obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o













obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o













obj-$(CONFIG_AMD_IOMMU) += amd/iommu.o amd/init.o amd/quirks.o













obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd/debugfs.o













obj-$(CONFIG_AMD_IOMMU_V2) += amd/iommu_v2.o















obj-$(CONFIG_ARM_SMMU) += arm_smmu.o















arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o















obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o













obj-$(CONFIG_DMAR_TABLE) += dmar.o













obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o













obj-$(CONFIG_INTEL_IOMMU) += intel-trace.o













obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel-iommu-debugfs.o













obj-$(CONFIG_INTEL_IOMMU_SVM) += intel-svm.o













obj-$(CONFIG_DMAR_TABLE) += intel/dmar.o













obj-$(CONFIG_INTEL_IOMMU) += intel/iommu.o intel/pasid.o













obj-$(CONFIG_INTEL_IOMMU) += intel/trace.o













obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel/debugfs.o













obj-$(CONFIG_INTEL_IOMMU_SVM) += intel/svm.o















obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o













obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o













obj-$(CONFIG_IRQ_REMAP) += intel/irq_remapping.o irq_remapping.o















obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o















obj-$(CONFIG_MTK_IOMMU_V1) += mtk_iommu_v1.o















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





















































































CRA Git | Maintained and supported by SUSTech CRA and CCSE