diff options
author | Sven Peter <[email protected]> | 2022-04-12 18:12:11 +0200 |
---|---|---|
committer | Joerg Roedel <[email protected]> | 2022-04-28 11:14:46 +0200 |
commit | ee5354345242ccf98dba164cc6b6e3e497a5f48f (patch) | |
tree | d62bd5936ad392019b11342b29aafae962c13434 | |
parent | af2d861d4cd2a4da5137f795ee3509e6f944a25b (diff) |
MAINTAINERS: Merge DART into ARM/APPLE MACHINE
It's the same people anyway.
Signed-off-by: Sven Peter <[email protected]>
Acked-by: Hector Martin <[email protected]>
Acked-by: Alyssa Rosenzweig <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Joerg Roedel <[email protected]>
-rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5e8c2f611766..0c504b0db7a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1376,14 +1376,6 @@ L: [email protected] S: Odd fixes F: drivers/input/mouse/bcm5974.c -APPLE DART IOMMU DRIVER -M: Sven Peter <[email protected]> -R: Alyssa Rosenzweig <[email protected]> -S: Maintained -F: Documentation/devicetree/bindings/iommu/apple,dart.yaml -F: drivers/iommu/apple-dart.c - APPLE PCIE CONTROLLER DRIVER M: Alyssa Rosenzweig <[email protected]> M: Marc Zyngier <[email protected]> @@ -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 |