More Arm SMMU updates for 5.9
- Move Arm SMMU driver files into their own subdirectory -----BEGIN PGP SIGNATURE----- iQFEBAABCgAuFiEEPxTL6PPUbjXGY88ct6xw3ITBYzQFAl8ewXgQHHdpbGxAa2Vy bmVsLm9yZwAKCRC3rHDchMFjNGfuB/wMYzwgDotb0nggknPfm/TEcucjdN6ClXqN 9YUCslL1ggSLNHIZYSXkLQ5wwPnIg/vFIoU5ishOLT4YumW0Abck0ARfuJOV87GV CO7h1iTS4fAxQarvtrjQmxYgNwlMI3+fKzNoQ/F9YP+v/2gUeuiPZibjyEtnc5jK S6yLvrvQRBCmDVXtnI0/RdXbBqF4SU1RgI16bq2TbKvj8NmiEtIZjY7VxDNHKOMW BpOw1r8Cl1K3uvgnkZzkOQPTvolgNpdXF3ZzyK219oN2FufD85w/g3LS00NuNwRc c72TP4SksXTvRz/XiFvfAuskXQI2j2hg1k3XMPeB7pbJnzO67DYf =chZm -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
e46b3c0d01
|
@ -1498,7 +1498,7 @@ R: Robin Murphy <robin.murphy@arm.com>
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: Documentation/devicetree/bindings/iommu/arm,smmu*
|
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-v7s.c
|
||||||
F: drivers/iommu/io-pgtable-arm.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>
|
R: Krishna Reddy <vdumpa@nvidia.com>
|
||||||
L: linux-tegra@vger.kernel.org
|
L: linux-tegra@vger.kernel.org
|
||||||
S: Supported
|
S: Supported
|
||||||
F: drivers/iommu/arm-smmu-nvidia.c
|
F: drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
|
||||||
F: drivers/iommu/tegra*
|
F: drivers/iommu/tegra*
|
||||||
|
|
||||||
TEGRA KBC DRIVER
|
TEGRA KBC DRIVER
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# 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.o
|
||||||
obj-$(CONFIG_IOMMU_API) += iommu-traces.o
|
obj-$(CONFIG_IOMMU_API) += iommu-traces.o
|
||||||
obj-$(CONFIG_IOMMU_API) += iommu-sysfs.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_IOMMU_IOVA) += iova.o
|
||||||
obj-$(CONFIG_OF_IOMMU) += of_iommu.o
|
obj-$(CONFIG_OF_IOMMU) += of_iommu.o
|
||||||
obj-$(CONFIG_MSM_IOMMU) += msm_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_IPMMU_VMSA) += ipmmu-vmsa.o
|
||||||
obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o
|
obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o
|
||||||
obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.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_EXYNOS_IOMMU) += exynos-iommu.o
|
||||||
obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o
|
obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o
|
||||||
obj-$(CONFIG_S390_IOMMU) += s390-iommu.o
|
obj-$(CONFIG_S390_IOMMU) += s390-iommu.o
|
||||||
obj-$(CONFIG_QCOM_IOMMU) += qcom_iommu.o
|
|
||||||
obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o
|
obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o
|
||||||
obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o
|
obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
|
obj-y += arm-smmu/ arm-smmu-v3/
|
|
@ -0,0 +1,2 @@
|
||||||
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
|
obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o
|
|
@ -0,0 +1,4 @@
|
||||||
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
|
obj-$(CONFIG_QCOM_IOMMU) += qcom_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
|
Loading…
Reference in New Issue