| Message ID | 20200603104521.GA14826@www.linux-watchdog.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [GIT,PULL,REQUEST] watchdog - v5.8 Merge window | expand |
The pull request you sent on Wed, 3 Jun 2020 12:45:21 +0200:
> git://www.linux-watchdog.org/linux-watchdog.git tags/linux-watchdog-5.8-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0486a39a6d6c8db78bde4d7b9c44e32dcc6050d4
Thank you!
diff --git a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml index 27e8c4accd67..572f4c912fef 100644 --- a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml @@ -24,6 +24,7 @@ properties: - items: - enum: + - renesas,r8a7742-wdt # RZ/G1H - renesas,r8a7743-wdt # RZ/G1M - renesas,r8a7744-wdt # RZ/G1N - renesas,r8a7745-wdt # RZ/G1E
Hi Linus, Please pull the watchdog changes for the v5.8 release cycle. This series contains: * 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 Please also note that Stephen Rothwell reported a conflict between the device tree and the watchdog tree on Tue, 26 May 2020 15:20:15 +1000. He fixed it with the following patch: --- The output from git request-pull: ---------------------------------------------------------------- The following changes since commit 9cb1fd0efd195590b828b9b865421ad345a4a145: Linux 5.7-rc7 (2020-05-24 15:32:54 -0700) are available in the git repository at: git://www.linux-watchdog.org/linux-watchdog.git tags/linux-watchdog-5.8-rc1 for you to fetch changes up to 072cb8b628d312f5785ffdf324286a0519aed910: watchdog: m54xx: Add missing include (2020-05-25 08:55:47 +0200) ---------------------------------------------------------------- linux-watchdog 5.8-rc1 tag ---------------------------------------------------------------- Arnd Bergmann (1): watchdog: iTCO: fix link error Bumsik Kim (1): watchdog: clarify that stop() is optional Dinghao Liu (1): watchdog: Fix runtime PM imbalance on error Evan Benn (1): dt-bindings: watchdog: Add ARM smc wdt for mt8173 watchdog Fabio Estevam (1): watchdog: imx_sc_wdt: Fix reboot on crash Jason Yan (1): watchdog: riowd: remove unneeded semicolon Julius Werner (1): watchdog: Add new arm_smc_wdt watchdog driver Lad Prabhakar (1): dt-bindings: watchdog: renesas,wdt: Document r8a7742 support Shyam Saini (1): watchdog: ts72xx_wdt: fix build error Stefan Riedmueller (3): watchdog: da9062: Initialize timeout during probe watchdog: da9063: Make use of pre-configured timeout during probe watchdog: da9062: No need to ping manually before setting timeout Thomas Gleixner (1): watchdog: m54xx: Add missing include Wolfram Sang (1): watchdog: imx2_wdt: update contact email .../devicetree/bindings/watchdog/arm-smc-wdt.yaml | 37 ++++ .../devicetree/bindings/watchdog/renesas,wdt.txt | 1 + .../watchdog/convert_drivers_to_kernel_api.rst | 2 +- Documentation/watchdog/watchdog-kernel-api.rst | 2 +- MAINTAINERS | 7 + arch/arm64/configs/defconfig | 1 + drivers/watchdog/Kconfig | 15 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/arm_smc_wdt.c | 188 +++++++++++++++++++++ drivers/watchdog/da9062_wdt.c | 32 ++-- drivers/watchdog/da9063_wdt.c | 20 ++- drivers/watchdog/imx2_wdt.c | 2 +- drivers/watchdog/imx_sc_wdt.c | 5 + drivers/watchdog/m54xx_wdt.c | 1 + drivers/watchdog/omap_wdt.c | 1 + drivers/watchdog/riowd.c | 2 +- include/linux/watchdog.h | 4 +- 17 files changed, 299 insertions(+), 22 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml create mode 100644 drivers/watchdog/arm_smc_wdt.c ---------------------------------------------------------------- Kind regards, Wim.