Skip to content

Commit bc3b897

Browse files
committed
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
2 parents 70d605c + c242507 commit bc3b897

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

MAINTAINERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ ACPI VIOT DRIVER
427427
M: Jean-Philippe Brucker <[email protected]>
428428
429429
430+
430431
S: Maintained
431432
F: drivers/acpi/viot.c
432433
F: include/linux/acpi_viot.h
@@ -960,6 +961,7 @@ AMD IOMMU (AMD-VI)
960961
M: Joerg Roedel <[email protected]>
961962
R: Suravee Suthikulpanit <[email protected]>
962963
964+
963965
S: Maintained
964966
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
965967
F: drivers/iommu/amd/
@@ -5976,6 +5978,7 @@ M: Christoph Hellwig <[email protected]>
59765978
M: Marek Szyprowski <[email protected]>
59775979
R: Robin Murphy <[email protected]>
59785980
5981+
59795982
S: Supported
59805983
W: http://git.infradead.org/users/hch/dma-mapping.git
59815984
T: git git://git.infradead.org/users/hch/dma-mapping.git
@@ -5988,6 +5991,7 @@ F: kernel/dma/
59885991
DMA MAPPING BENCHMARK
59895992
M: Xiang Chen <[email protected]>
59905993
5994+
59915995
F: kernel/dma/map_benchmark.c
59925996
F: tools/testing/selftests/dma/
59935997

@@ -7572,6 +7576,7 @@ F: drivers/gpu/drm/exynos/exynos_dp*
75727576
EXYNOS SYSMMU (IOMMU) driver
75737577
M: Marek Szyprowski <[email protected]>
75747578
7579+
75757580
S: Maintained
75767581
F: drivers/iommu/exynos-iommu.c
75777582

@@ -9991,6 +9996,7 @@ INTEL IOMMU (VT-d)
99919996
M: David Woodhouse <[email protected]>
99929997
M: Lu Baolu <[email protected]>
99939998
9999+
999410000
S: Supported
999510001
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
999610002
F: drivers/iommu/intel/
@@ -10370,6 +10376,7 @@ IOMMU DRIVERS
1037010376
M: Joerg Roedel <[email protected]>
1037110377
M: Will Deacon <[email protected]>
1037210378
10379+
1037310380
S: Maintained
1037410381
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
1037510382
F: Documentation/devicetree/bindings/iommu/
@@ -12528,6 +12535,7 @@ F: drivers/i2c/busses/i2c-mt65xx.c
1252812535
MEDIATEK IOMMU DRIVER
1252912536
M: Yong Wu <[email protected]>
1253012537
12538+
1253112539
L: [email protected] (moderated for non-subscribers)
1253212540
S: Supported
1253312541
F: Documentation/devicetree/bindings/iommu/mediatek*
@@ -16569,6 +16577,7 @@ F: drivers/i2c/busses/i2c-qcom-cci.c
1656916577
QUALCOMM IOMMU
1657016578
M: Rob Clark <[email protected]>
1657116579
16580+
1657216581
1657316582
S: Maintained
1657416583
F: drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@ -19194,6 +19203,7 @@ F: arch/x86/boot/video*
1919419203
SWIOTLB SUBSYSTEM
1919519204
M: Christoph Hellwig <[email protected]>
1919619205
19206+
1919719207
S: Supported
1919819208
W: http://git.infradead.org/users/hch/dma-mapping.git
1919919209
T: git git://git.infradead.org/users/hch/dma-mapping.git
@@ -21868,6 +21878,7 @@ M: Juergen Gross <[email protected]>
2186821878
M: Stefano Stabellini <[email protected]>
2186921879
L: [email protected] (moderated for non-subscribers)
2187021880
21881+
2187121882
S: Supported
2187221883
F: arch/x86/xen/*swiotlb*
2187321884
F: drivers/xen/*swiotlb*

drivers/iommu/ipmmu-vmsa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ static const struct of_device_id ipmmu_of_ids[] = {
987987
.compatible = "renesas,ipmmu-r8a779a0",
988988
.data = &ipmmu_features_rcar_gen4,
989989
}, {
990-
.compatible = "renesas,rcar-gen4-ipmmu",
990+
.compatible = "renesas,rcar-gen4-ipmmu-vmsa",
991991
.data = &ipmmu_features_rcar_gen4,
992992
}, {
993993
/* Terminator */

0 commit comments

Comments
 (0)