Commit e46b3c0d authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next 

More Arm SMMU updates for 5.9

- Move Arm SMMU driver files into their own subdirectory
parents 56fbacc9 e86d1aa8

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










@@ -16827,7 +16827,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
−5






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









obj-y += amd/ intel/









obj-y += amd/ intel/ arm/









obj-$(CONFIG_IOMMU_API) += iommu.o









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









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










@@ -12,9 +12,6 @@ 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_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_IPMMU_VMSA) += ipmmu-vmsa.o









obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o









obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o










@@ -28,6 +25,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