aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2022-06-24 13:41:47 -0700
committerLinus Torvalds <[email protected]>2022-06-24 13:41:47 -0700
commitbc3b8977e3747ab8aa54a0760dce5cdfa37ad4d6 (patch)
tree5145c1581d5645fc4e43d7fb6a3c5b5598ae686d
parent70d605cbeecb408dd884b1f0cd3963eeeaac144c (diff)
parentc242507c1b895646b4a25060df13b6214805759f (diff)
Merge tag 'iommu-fixes-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel: - Add a new IOMMU mailing list to the MAINTAINERS file to prepare for the a list migration happening on July 5th. The old list needs to stay in place until the switch happens to guarantee seemless archiving of list email. - Fix compatible device-tree string for rcar-gen4 in Renesas IOMMU driver. * tag 'iommu-fixes-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: MAINTAINERS: Add new IOMMU development mailing list iommu/ipmmu-vmsa: Fix compatible for rcar-gen4
-rw-r--r--MAINTAINERS11
-rw-r--r--drivers/iommu/ipmmu-vmsa.c2
2 files changed, 12 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8e7e66cf8063..398b89e01a44 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -427,6 +427,7 @@ ACPI VIOT DRIVER
M: Jean-Philippe Brucker <[email protected]>
S: Maintained
F: drivers/acpi/viot.c
F: include/linux/acpi_viot.h
@@ -960,6 +961,7 @@ AMD IOMMU (AMD-VI)
M: Joerg Roedel <[email protected]>
R: Suravee Suthikulpanit <[email protected]>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
F: drivers/iommu/amd/
@@ -5976,6 +5978,7 @@ M: Christoph Hellwig <[email protected]>
M: Marek Szyprowski <[email protected]>
R: Robin Murphy <[email protected]>
S: Supported
W: http://git.infradead.org/users/hch/dma-mapping.git
T: git git://git.infradead.org/users/hch/dma-mapping.git
@@ -5988,6 +5991,7 @@ F: kernel/dma/
DMA MAPPING BENCHMARK
M: Xiang Chen <[email protected]>
F: kernel/dma/map_benchmark.c
F: tools/testing/selftests/dma/
@@ -7572,6 +7576,7 @@ F: drivers/gpu/drm/exynos/exynos_dp*
EXYNOS SYSMMU (IOMMU) driver
M: Marek Szyprowski <[email protected]>
S: Maintained
F: drivers/iommu/exynos-iommu.c
@@ -9991,6 +9996,7 @@ INTEL IOMMU (VT-d)
M: David Woodhouse <[email protected]>
M: Lu Baolu <[email protected]>
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
F: drivers/iommu/intel/
@@ -10370,6 +10376,7 @@ IOMMU DRIVERS
M: Joerg Roedel <[email protected]>
M: Will Deacon <[email protected]>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
F: Documentation/devicetree/bindings/iommu/
@@ -12528,6 +12535,7 @@ F: drivers/i2c/busses/i2c-mt65xx.c
MEDIATEK IOMMU DRIVER
M: Yong Wu <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Supported
F: Documentation/devicetree/bindings/iommu/mediatek*
@@ -16569,6 +16577,7 @@ F: drivers/i2c/busses/i2c-qcom-cci.c
QUALCOMM IOMMU
M: Rob Clark <[email protected]>
S: Maintained
F: drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@ -19194,6 +19203,7 @@ F: arch/x86/boot/video*
SWIOTLB SUBSYSTEM
M: Christoph Hellwig <[email protected]>
S: Supported
W: http://git.infradead.org/users/hch/dma-mapping.git
T: git git://git.infradead.org/users/hch/dma-mapping.git
@@ -21868,6 +21878,7 @@ M: Juergen Gross <[email protected]>
M: Stefano Stabellini <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Supported
F: arch/x86/xen/*swiotlb*
F: drivers/xen/*swiotlb*
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 8fdb84b3642b..1d42084d0276 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -987,7 +987,7 @@ static const struct of_device_id ipmmu_of_ids[] = {
.compatible = "renesas,ipmmu-r8a779a0",
.data = &ipmmu_features_rcar_gen4,
}, {
- .compatible = "renesas,rcar-gen4-ipmmu",
+ .compatible = "renesas,rcar-gen4-ipmmu-vmsa",
.data = &ipmmu_features_rcar_gen4,
}, {
/* Terminator */