Skip to content

Commit ad8694b

Browse files
committed
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 <[email protected]> Reviewed-by: Suravee Suthikulpanit <[email protected]> Reviewed-by: Jerry Snitselaar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 431275a commit ad8694b

File tree

9 files changed

+6
-6
lines changed

9 files changed

+6
-6
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ M: Joerg Roedel <[email protected]>
876876
877877
S: Maintained
878878
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
879-
F: drivers/iommu/amd_iommu*.[ch]
879+
F: drivers/iommu/amd/
880880
F: include/linux/amd-iommu.h
881881

882882
AMD KFD

drivers/iommu/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ obj-$(CONFIG_IOASID) += ioasid.o
1111
obj-$(CONFIG_IOMMU_IOVA) += iova.o
1212
obj-$(CONFIG_OF_IOMMU) += of_iommu.o
1313
obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o
14-
obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o
15-
obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o
16-
obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o
14+
obj-$(CONFIG_AMD_IOMMU) += amd/iommu.o amd/init.o amd/quirks.o
15+
obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd/debugfs.o
16+
obj-$(CONFIG_AMD_IOMMU_V2) += amd/iommu_v2.o
1717
obj-$(CONFIG_ARM_SMMU) += arm_smmu.o
1818
arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o
1919
obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o
File renamed without changes.
File renamed without changes.
File renamed without changes.

drivers/iommu/amd_iommu_init.c renamed to drivers/iommu/amd/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <linux/crash_dump.h>
3434

3535
#include "amd_iommu.h"
36-
#include "irq_remapping.h"
36+
#include "../irq_remapping.h"
3737

3838
/*
3939
* definitions for the ACPI scanning code

drivers/iommu/amd_iommu.c renamed to drivers/iommu/amd/iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include <asm/dma.h>
4444

4545
#include "amd_iommu.h"
46-
#include "irq_remapping.h"
46+
#include "../irq_remapping.h"
4747

4848
#define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
4949

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)