diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 10:50:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 10:50:22 -0700 |
| commit | 0486a39a6d6c8db78bde4d7b9c44e32dcc6050d4 (patch) | |
| tree | c05562d55a5563caffbbc8f950585a3ea597435b /MAINTAINERS | |
| parent | 302d5b3321aa61ff4ab15f0abc737d923355d33d (diff) | |
| parent | 072cb8b628d312f5785ffdf324286a0519aed910 (diff) | |
| download | linux-0486a39a6d6c8db78bde4d7b9c44e32dcc6050d4.tar.bz2 | |
Merge tag 'linux-watchdog-5.8-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck:
- add new arm_smc_wdt watchdog driver
- da9062 and da9063 improvements
- clarify documentation about stop() that became optional
- document r8a7742 support
- some overall fixes and improvements
* tag 'linux-watchdog-5.8-rc1' of git://www.linux-watchdog.org/linux-watchdog:
watchdog: m54xx: Add missing include
dt-bindings: watchdog: renesas,wdt: Document r8a7742 support
watchdog: Fix runtime PM imbalance on error
watchdog: riowd: remove unneeded semicolon
watchdog: Add new arm_smc_wdt watchdog driver
dt-bindings: watchdog: Add ARM smc wdt for mt8173 watchdog
watchdog: imx2_wdt: update contact email
watchdog: iTCO: fix link error
watchdog: da9062: No need to ping manually before setting timeout
watchdog: da9063: Make use of pre-configured timeout during probe
watchdog: da9062: Initialize timeout during probe
watchdog: clarify that stop() is optional
watchdog: imx_sc_wdt: Fix reboot on crash
watchdog: ts72xx_wdt: fix build error
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9f7fb09a0140..465210f17948 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1468,6 +1468,13 @@ S: Maintained F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt F: drivers/irqchip/irq-vic.c +ARM SMC WATCHDOG DRIVER +M: Julius Werner <jwerner@chromium.org> +R: Evan Benn <evanbenn@chromium.org> +S: Maintained +F: devicetree/bindings/watchdog/arm-smc-wdt.yaml +F: drivers/watchdog/arm_smc_wdt.c + ARM SMMU DRIVERS M: Will Deacon <will@kernel.org> R: Robin Murphy <robin.murphy@arm.com> |