Commit e86d1aa8 authored by Will Deacon's avatar Will Deacon
Browse files

iommu/arm-smmu: Move Arm SMMU drivers into their own subdirectory 



The Arm SMMU drivers are getting fat on vendor value-add, so move them
to their own subdirectory out of the way of the other IOMMU drivers.

Suggested-by: default avatarJoerg Roedel <joro@8bytes.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent aa7ec732

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1498,7 +1498,7 @@ R: Robin Murphy <robin.murphy@arm.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/iommu/arm,smmu*

F:	drivers/iommu/arm-smmu*

F:	drivers/iommu/arm/

F:	drivers/iommu/io-pgtable-arm-v7s.c

F:	drivers/iommu/io-pgtable-arm.c








@@ -16813,7 +16813,7 @@ M:	Thierry Reding <thierry.reding@gmail.com>







R:	Krishna Reddy <vdumpa@nvidia.com>









L:	linux-tegra@vger.kernel.org









S:	Supported









F:	drivers/iommu/arm-smmu-nvidia.c









F:	drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c









F:	drivers/iommu/tegra*

















TEGRA KBC DRIVER
































drivers/iommu/Makefile



+1
−4






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









obj-y += arm/









obj-$(CONFIG_IOMMU_API) += iommu.o









obj-$(CONFIG_IOMMU_API) += iommu-traces.o









obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o








@@ -14,9 +15,6 @@ obj-$(CONFIG_MSM_IOMMU) += msm_iommu.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-nvidia.o arm-smmu-qcom.o









obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.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








@@ -35,6 +33,5 @@ obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o







obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o









obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o









obj-$(CONFIG_S390_IOMMU) += s390-iommu.o









obj-$(CONFIG_QCOM_IOMMU) += qcom_iommu.o









obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o









obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o
























drivers/iommu/arm/Makefile
0 → 100644



+2
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









obj-y += arm-smmu/ arm-smmu-v3/
























drivers/iommu/arm/arm-smmu-v3/Makefile
0 → 100644



+2
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









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