diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/iommu/Makefile | 6 | ||||
| -rw-r--r-- | drivers/iommu/amd/amd_iommu.h (renamed from drivers/iommu/amd_iommu.h) | 0 | ||||
| -rw-r--r-- | drivers/iommu/amd/amd_iommu_types.h (renamed from drivers/iommu/amd_iommu_types.h) | 0 | ||||
| -rw-r--r-- | drivers/iommu/amd/debugfs.c (renamed from drivers/iommu/amd_iommu_debugfs.c) | 0 | ||||
| -rw-r--r-- | drivers/iommu/amd/init.c (renamed from drivers/iommu/amd_iommu_init.c) | 2 | ||||
| -rw-r--r-- | drivers/iommu/amd/iommu.c (renamed from drivers/iommu/amd_iommu.c) | 2 | ||||
| -rw-r--r-- | drivers/iommu/amd/iommu_v2.c (renamed from drivers/iommu/amd_iommu_v2.c) | 0 | ||||
| -rw-r--r-- | drivers/iommu/amd/quirks.c (renamed from drivers/iommu/amd_iommu_quirks.c) | 0 |
9 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 50659d76976b..dd59ec6676d9 100644 --- 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 index 57cf4ba5e27c..3af7e374b0cb 100644 --- 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 b/drivers/iommu/amd/amd_iommu.h index f892992c8744..f892992c8744 100644 --- a/drivers/iommu/amd_iommu.h +++ b/drivers/iommu/amd/amd_iommu.h diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h index 30a5d412255a..30a5d412255a 100644 --- a/drivers/iommu/amd_iommu_types.h +++ b/drivers/iommu/amd/amd_iommu_types.h diff --git a/drivers/iommu/amd_iommu_debugfs.c b/drivers/iommu/amd/debugfs.c index 545372fcc72f..545372fcc72f 100644 --- a/drivers/iommu/amd_iommu_debugfs.c +++ b/drivers/iommu/amd/debugfs.c diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd/init.c index 3faff7f80fd2..6ebd4825e320 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/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 b/drivers/iommu/amd/iommu.c index 311ef7105c6d..74cca1757172 100644 --- a/drivers/iommu/amd_iommu.c +++ b/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 b/drivers/iommu/amd/iommu_v2.c index c8a7b6b39222..c8a7b6b39222 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd/iommu_v2.c diff --git a/drivers/iommu/amd_iommu_quirks.c b/drivers/iommu/amd/quirks.c index 5120ce4fdce3..5120ce4fdce3 100644 --- a/drivers/iommu/amd_iommu_quirks.c +++ b/drivers/iommu/amd/quirks.c |