From: Joerg Roedel <jroedel@suse.de>
Date: Wed, 29 Jul 2020 12:47:37 +0000 (+0200)
Subject: Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will... 
X-Git-Tag: v5.9-rc1~60^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e46b3c0d011eab9933c183d5b47569db8e377281;p=thirdparty%2Fkernel%2Flinux.git

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
---

e46b3c0d011eab9933c183d5b47569db8e377281
diff --cc drivers/iommu/Makefile
index bfd1a9873091c,d971cffc810bf..11f1771104f3a
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  # SPDX-License-Identifier: GPL-2.0
- obj-y += amd/ intel/
 -obj-y += arm/
++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,11 -12,16 +12,8 @@@ obj-$(CONFIG_IOASID) += ioasid.
  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_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_DMAR_TABLE) += intel/dmar.o
 -obj-$(CONFIG_INTEL_IOMMU) += intel/iommu.o intel/pasid.o
 -obj-$(CONFIG_INTEL_IOMMU) += intel/trace.o
 -obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel/debugfs.o
 -obj-$(CONFIG_INTEL_IOMMU_SVM) += intel/svm.o
  obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o
 -obj-$(CONFIG_IRQ_REMAP) += intel/irq_remapping.o irq_remapping.o
 +obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o
  obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o
  obj-$(CONFIG_MTK_IOMMU_V1) += mtk_iommu_v1.o
  obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o