Merge tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
[linux-2.6-microblaze.git] / MAINTAINERS
index fb1c48c..59ff351 100644 (file)
@@ -1268,6 +1268,13 @@ L:       linux-input@vger.kernel.org
 S:     Odd fixes
 F:     drivers/input/mouse/bcm5974.c
 
+APPLE DART IOMMU DRIVER
+M:     Sven Peter <sven@svenpeter.dev>
+L:     iommu@lists.linux-foundation.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/iommu/apple,dart.yaml
+F:     drivers/iommu/apple-dart.c
+
 APPLE SMC DRIVER
 M:     Henrik Rydberg <rydberg@bitmath.org>
 L:     linux-hwmon@vger.kernel.org
@@ -11113,7 +11120,7 @@ MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
 M:     Rahul Bedarkar <rahulbedarkar89@gmail.com>
 L:     linux-mips@vger.kernel.org
 S:     Maintained
-F:     arch/mips/boot/dts/img/pistachio_marduk.dts
+F:     arch/mips/boot/dts/img/pistachio*
 
 MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
 M:     Andrew Lunn <andrew@lunn.ch>
@@ -14817,14 +14824,6 @@ S:     Maintained
 W:     http://www.st.com/spear
 F:     drivers/pinctrl/spear/
 
-PISTACHIO SOC SUPPORT
-M:     James Hartley <james.hartley@sondrel.com>
-L:     linux-mips@vger.kernel.org
-S:     Odd Fixes
-F:     arch/mips/boot/dts/img/pistachio*
-F:     arch/mips/configs/pistachio*_defconfig
-F:     arch/mips/pistachio/
-
 PKTCDVD DRIVER
 M:     linux-block@vger.kernel.org
 S:     Orphan