Merge tag 'asahi-soc-maintainers-5.17' of https://github.com/AsahiLinux/linux into...

Apple SoC MAINTAINERS updates for 5.17.

Adds the watchdog driver MAINTAINERS changes. The driver itself is
already merged.

This branch is based on asahi-soc-dt-5.17-v2 to avoid a merge conflict.

* tag 'asahi-soc-maintainers-5.17' of https://github.com/AsahiLinux/linux:
  MAINTAINERS: Add Apple watchdog to ARM/APPLE MACHINE SUPPORT

Link: https://lore.kernel.org/r/24ae6871-3e67-5c7f-2060-28048db439a2@marcan.st
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index caa5b01..7158c29 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1780,6 +1780,7 @@ F:        drivers/irqchip/irq-apple-aic.c
 F:     drivers/mailbox/apple-mailbox.c
 F:     drivers/pinctrl/pinctrl-apple-gpio.c
 F:     drivers/soc/apple/*
+F:     drivers/watchdog/apple_wdt.c
 F:     include/dt-bindings/interrupt-controller/apple-aic.h
 F:     include/dt-bindings/pinctrl/apple.h
 F:     include/linux/apple-mailbox.h