From ee5354345242ccf98dba164cc6b6e3e497a5f48f Mon Sep 17 00:00:00 2001 From: Sven Peter Date: Tue, 12 Apr 2022 18:12:11 +0200 Subject: MAINTAINERS: Merge DART into ARM/APPLE MACHINE It's the same people anyway. Signed-off-by: Sven Peter Acked-by: Hector Martin Acked-by: Alyssa Rosenzweig Link: https://lore.kernel.org/r/20220412161211.23162-1-sven@svenpeter.dev Signed-off-by: Joerg Roedel --- MAINTAINERS | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 5e8c2f611766..0c504b0db7a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 -R: Alyssa Rosenzweig -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 M: Marc Zyngier @@ -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 -- cgit v1.2.3-58-ga151