iommu/amd: Move AMD IOMMU driver into subdirectory

Move all files related to the AMD IOMMU driver into its own subdirectory. Signed-off-by: Joerg Roedel <jroedel@suse.de> Reviewed-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com> Link: https://lore.kernel.org/r/20200609130303.26974-2-joro@8bytes.org
mariux64 · Jun 10, 2020 · ad8694b · ad8694b
1 parent 431275a
commit ad8694b
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -876,7 +876,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

diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
@@ -11,9 +11,9 @@ 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

diff --git a/drivers/iommu/amd_iommu.h → drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd_iommu.h → drivers/iommu/amd/amd_iommu.h
diff --git a/drivers/iommu/amd_iommu_types.h → drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h → drivers/iommu/amd/amd_iommu_types.h
diff --git a/drivers/iommu/amd_iommu_debugfs.c → drivers/iommu/amd/debugfs.c b/drivers/iommu/amd_iommu_debugfs.c → drivers/iommu/amd/debugfs.c
diff --git a/drivers/iommu/amd_iommu_init.c → drivers/iommu/amd/init.c b/drivers/iommu/amd_iommu_init.c → drivers/iommu/amd/init.c
@@ -33,7 +33,7 @@
 #include <linux/crash_dump.h>
 
 #include "amd_iommu.h"
-#include "irq_remapping.h"
+#include "../irq_remapping.h"
 
 /*
  * definitions for the ACPI scanning code

diff --git a/drivers/iommu/amd_iommu.c → drivers/iommu/amd/iommu.c b/drivers/iommu/amd_iommu.c → drivers/iommu/amd/iommu.c
@@ -43,7 +43,7 @@
 #include <asm/dma.h>
 
 #include "amd_iommu.h"
-#include "irq_remapping.h"
+#include "../irq_remapping.h"
 
 #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
 

diff --git a/drivers/iommu/amd_iommu_v2.c → drivers/iommu/amd/iommu_v2.c b/drivers/iommu/amd_iommu_v2.c → drivers/iommu/amd/iommu_v2.c
diff --git a/drivers/iommu/amd_iommu_quirks.c → drivers/iommu/amd/quirks.c b/drivers/iommu/amd_iommu_quirks.c → drivers/iommu/amd/quirks.c