]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
MAINTAINERS: Merge DART into ARM/APPLE MACHINE
authorSven Peter <sven@svenpeter.dev>
Tue, 12 Apr 2022 16:12:11 +0000 (18:12 +0200)
committerJoerg Roedel <jroedel@suse.de>
Thu, 28 Apr 2022 09:14:46 +0000 (11:14 +0200)
It's the same people anyway.

Signed-off-by: Sven Peter <sven@svenpeter.dev>
Acked-by: Hector Martin <marcan@marcan.st>
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Link: https://lore.kernel.org/r/20220412161211.23162-1-sven@svenpeter.dev
Signed-off-by: Joerg Roedel <jroedel@suse.de>
MAINTAINERS

index 5e8c2f61176619421d6e661b4ac45000e584f219..0c504b0db7a53d6d1ddc7484527e0b19ea57869a 100644 (file)
@@ -1376,14 +1376,6 @@ 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>
-R:     Alyssa Rosenzweig <alyssa@rosenzweig.io>
-L:     iommu@lists.linux-foundation.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/iommu/apple,dart.yaml
-F:     drivers/iommu/apple-dart.c
-
 APPLE PCIE CONTROLLER DRIVER
 M:     Alyssa Rosenzweig <alyssa@rosenzweig.io>
 M:     Marc Zyngier <maz@kernel.org>
@@ -1837,6 +1829,7 @@ F:        Documentation/devicetree/bindings/arm/apple/*
 F:     Documentation/devicetree/bindings/clock/apple,nco.yaml
 F:     Documentation/devicetree/bindings/i2c/apple,i2c.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/apple,*
+F:     Documentation/devicetree/bindings/iommu/apple,dart.yaml
 F:     Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
 F:     Documentation/devicetree/bindings/pci/apple,pcie.yaml
 F:     Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
@@ -1846,6 +1839,7 @@ F:        arch/arm64/boot/dts/apple/
 F:     drivers/clk/clk-apple-nco.c
 F:     drivers/i2c/busses/i2c-pasemi-core.c
 F:     drivers/i2c/busses/i2c-pasemi-platform.c
+F:     drivers/iommu/apple-dart.c
 F:     drivers/irqchip/irq-apple-aic.c
 F:     drivers/mailbox/apple-mailbox.c
 F:     drivers/pinctrl/pinctrl-apple-gpio.c