mbox series

[GIT,PULL,REQUEST] watchdog - v5.14 Merge window

Message ID 20210707151941.GA512@www.linux-watchdog.org (mailing list archive)
State Not Applicable
Headers show
Series [GIT,PULL,REQUEST] watchdog - v5.14 Merge window | expand

Pull-request

git://www.linux-watchdog.org/linux-watchdog.git tags/linux-watchdog-5.14-rc1

Message

Wim Van Sebroeck July 7, 2021, 3:19 p.m. UTC
Hi Linus,

Please pull the watchdog changes for the v5.12 release cycle.

This series contains:
* Add Mstar MSC313e WDT driver
* Add support for sama7g5-wdt
* Add compatible for SC7280 SoC
* Add compatible for Mediatek MT8195
* sbsa: Support architecture version 1
* Removal of the MV64x60 watchdog driver
* Extra PCI IDs for hpwdt
* Add hrtimer-based pretimeout feature
* Add {min,max}_timeout sysfs nodes
* keembay timeout and pre-timeout handling
* Several fixes, cleanups and improvements

The output from git request-pull:
----------------------------------------------------------------
The following changes since commit c4681547bcce777daf576925a966ffa824edd09d:

  Linux 5.13-rc3 (2021-05-23 11:42:48 -1000)

are available in the git repository at:

  git://www.linux-watchdog.org/linux-watchdog.git tags/linux-watchdog-5.14-rc1

for you to fetch changes up to cf813c67d9619fd474c785698cbed543b94209dd:

  watchdog: iTCO_wdt: use dev_err() instead of pr_err() (2021-06-21 08:49:19 +0200)

----------------------------------------------------------------
linux-watchdog 5.14-rc1 tag

----------------------------------------------------------------
Andy Shevchenko (2):
      watchdog: sp805: Use devm_clk_get_optional()
      watchdog: sp805: Fix kernel doc description

Bhaskar Chowdhury (2):
      watchdog: sl28cpld_wdt: Fix a typo
      watchdog: Fix a typo in the file orion_wdt.c

Christophe Leroy (1):
      watchdog: Remove MV64x60 watchdog driver

Curtis Klein (1):
      watchdog: Add hrtimer-based pretimeout feature

Daniel Palmer (1):
      watchdog: Add Mstar MSC313e WDT driver

Enrico Weigelt, metux IT consult (1):
      watchdog: iTCO_wdt: use dev_err() instead of pr_err()

Eugen Hristev (3):
      dt-bindings: watchdog: sama5d4-wdt: convert to yaml
      watchdog: sama5d4_wdt: add support for sama7g5-wdt
      dt-bindings: watchdog: sama5d4-wdt: add compatible for sama7g5-wdt

Flavio Suligoi (1):
      watchdog: wdat_wdg: fix typo

Jan Kiszka (1):
      watchdog: iTCO_wdt: Account for rebooting on second timeout

Jerry Hoemann (1):
      watchdog/hpwdt: New PCI IDs

Jiapeng Chong (2):
      watchdog: dw_wdt: Fix duplicate included linux/kernel.h
      watchdog: it87_wdt: remove useless function

Juerg Haefliger (3):
      watchdog: Add {min,max}_timeout sysfs nodes
      watchdog: Use sysfs_emit() and sysfs_emit_at() in "show" functions
      watchdog: ziirave_wdt: Remove VERSION_FMT defines and add sysfs newlines

Junlin Yang (1):
      watchdog: diag288_wdt: Remove redundant assignment

Liang Chen (1):
      dt-bindings: watchdog: dw-wdt: add description for rk3568

Lukas Bulwahn (1):
      watchdog: fix syntactic kernel-doc issues

Randy Dunlap (2):
      watchdog: mtx-1: drop au1000.h header file
      watchdog: clean up the Kconfig file

Rob Herring (1):
      dt-bindings: watchdog: Convert arm,sbsa-gwdt to DT schema

Robin Gong (1):
      watchdog: imx2_wdt: avoid to ping before resume back

Romain Perier (1):
      dt-bindings: watchdog: Add Mstar MSC313e WDT devicetree bindings documentation

Sai Prakash Ranjan (2):
      watchdog: qcom: Move suspend/resume to suspend_late/resume_early
      dt-bindings: watchdog: Add compatible for SC7280 SoC

Seiya Wang (1):
      dt-bindings: watchdog: Add compatible for Mediatek MT8195

Shaokun Zhang (1):
      watchdog: sbsa: Support architecture version 1

Shruthi Sanil (9):
      watchdog: keembay: Update WDT pre-timeout during the initialization
      watchdog: keembay: Upadate WDT pretimeout for every update in timeout
      watchdog: keembay: Update pretimeout to zero in the TH ISR
      watchdog: keembay: Clear either the TO or TH interrupt bit
      watchdog: keembay: Remove timeout update in the WDT start function
      watchdog: keembay: MACRO for WDT enable and disable values
      watchdog: keembay: Removed timeout update in the TO ISR
      watchdog: keembay: WDT SMC handler MACRO name update
      watchdog: keembay: Typo corrections and other blank operations

Srinivas Goud (3):
      watchdog: of_xilinx_wdt: Add comment to spinlock
      watchdog: of_xilinx_wdt: Used BIT macro
      watchdog: of_xilinx_wdt: Used dev_dbg()

Srinivas Neeli (2):
      watchdog: of_xilinx_wdt: Remove passing null pointer
      watchdog: of_xilinx_wdt: Skip printing pointer value

Stefan Eichenberger (1):
      watchdog: imx_sc_wdt: fix pretimeout

Tao Ren (1):
      watchdog: aspeed: fix hardware timeout calculation

Tian Tao (1):
      watchdog: meson_wdt: Use device_get_match_data() helper

Wang Qing (2):
      watchdog: mtk: support pre-timeout when the bark irq is available
      doc: mtk-wdt: support pre-timeout when the bark irq is available

Wei Yongjun (1):
      watchdog: jz4740: Fix return value check in jz4740_wdt_probe()

Wong Vee Khee (1):
      watchdog: Fix a typo in Kconfig

Zou Wei (3):
      watchdog: Fix possible use-after-free in wdt_startup()
      watchdog: sc520_wdt: Fix possible use-after-free in wdt_turnoff()
      watchdog: Fix possible use-after-free by calling del_timer_sync()

Álvaro Fernández Rojas (1):
      watchdog: bcm7038_wdt: add big endian support

 .../bindings/watchdog/arm,sbsa-gwdt.yaml           |  51 ++++
 .../bindings/watchdog/atmel,sama5d4-wdt.yaml       |  74 +++++
 .../bindings/watchdog/atmel-sama5d4-wdt.txt        |  34 ---
 .../bindings/watchdog/mstar,msc313e-wdt.yaml       |  40 +++
 .../devicetree/bindings/watchdog/mtk-wdt.txt       |   6 +
 .../devicetree/bindings/watchdog/qcom-wdt.yaml     |   1 +
 .../devicetree/bindings/watchdog/sbsa-gwdt.txt     |  31 --
 .../devicetree/bindings/watchdog/snps,dw-wdt.yaml  |   1 +
 MAINTAINERS                                        |   1 +
 drivers/watchdog/Kconfig                           |  77 +++--
 drivers/watchdog/Makefile                          |   3 +-
 drivers/watchdog/aspeed_wdt.c                      |   6 +-
 drivers/watchdog/bcm7038_wdt.c                     |  31 +-
 drivers/watchdog/booke_wdt.c                       |   2 +-
 drivers/watchdog/diag288_wdt.c                     |   4 -
 drivers/watchdog/dw_wdt.c                          |   9 +-
 drivers/watchdog/eurotechwdt.c                     |   2 +-
 drivers/watchdog/hpwdt.c                           |   1 +
 drivers/watchdog/iTCO_wdt.c                        |  16 +-
 drivers/watchdog/imx2_wdt.c                        |  10 +
 drivers/watchdog/imx_sc_wdt.c                      |  11 +-
 drivers/watchdog/it87_wdt.c                        |   8 -
 drivers/watchdog/jz4740_wdt.c                      |   4 +-
 drivers/watchdog/keembay_wdt.c                     |  34 ++-
 drivers/watchdog/lpc18xx_wdt.c                     |   2 +-
 drivers/watchdog/mei_wdt.c                         |   8 +-
 drivers/watchdog/meson_wdt.c                       |   8 +-
 drivers/watchdog/msc313e_wdt.c                     | 166 +++++++++++
 drivers/watchdog/mtk_wdt.c                         |  77 ++++-
 drivers/watchdog/mtx-1_wdt.c                       |   2 -
 drivers/watchdog/mv64x60_wdt.c                     | 324 ---------------------
 drivers/watchdog/octeon-wdt-main.c                 |  12 +-
 drivers/watchdog/of_xilinx_wdt.c                   |  38 +--
 drivers/watchdog/orion_wdt.c                       |   2 +-
 drivers/watchdog/pc87413_wdt.c                     |   2 +-
 drivers/watchdog/qcom-wdt.c                        |   4 +-
 drivers/watchdog/sama5d4_wdt.c                     |  10 +-
 drivers/watchdog/sbc60xxwdt.c                      |   2 +-
 drivers/watchdog/sbsa_gwdt.c                       |  54 +++-
 drivers/watchdog/sc520_wdt.c                       |   2 +-
 drivers/watchdog/sl28cpld_wdt.c                    |   2 +-
 drivers/watchdog/sp805_wdt.c                       |  43 ++-
 drivers/watchdog/w83877f_wdt.c                     |   2 +-
 drivers/watchdog/watchdog_core.h                   |  48 +++
 drivers/watchdog/watchdog_dev.c                    |  86 +++---
 drivers/watchdog/watchdog_hrtimer_pretimeout.c     |  44 +++
 drivers/watchdog/watchdog_pretimeout.c             |   9 +-
 drivers/watchdog/wdat_wdt.c                        |   4 +-
 drivers/watchdog/wdt.c                             |   4 +-
 drivers/watchdog/wdt_pci.c                         |   2 +-
 drivers/watchdog/ziirave_wdt.c                     |  21 +-
 include/linux/mv643xx.h                            |   8 -
 52 files changed, 825 insertions(+), 618 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/watchdog/arm,sbsa-gwdt.yaml
 create mode 100644 Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
 delete mode 100644 Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/mstar,msc313e-wdt.yaml
 delete mode 100644 Documentation/devicetree/bindings/watchdog/sbsa-gwdt.txt
 create mode 100644 drivers/watchdog/msc313e_wdt.c
 delete mode 100644 drivers/watchdog/mv64x60_wdt.c
 create mode 100644 drivers/watchdog/watchdog_hrtimer_pretimeout.c
----------------------------------------------------------------

Kind regards,
Wim.

Comments

pr-tracker-bot@kernel.org July 7, 2021, 8:40 p.m. UTC | #1
The pull request you sent on Wed, 7 Jul 2021 17:19:42 +0200:

> git://www.linux-watchdog.org/linux-watchdog.git tags/linux-watchdog-5.14-rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9d69294be2a363a0128f4dc0316a7a4bb29ea91f

Thank you!
pr-tracker-bot@kernel.org July 7, 2021, 8:40 p.m. UTC | #2
The pull request you sent on Wed, 7 Jul 2021 17:19:42 +0200:

> git://www.linux-watchdog.org/linux-watchdog.git tags/linux-watchdog-5.14-rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9d69294be2a363a0128f4dc0316a7a4bb29ea91f

Thank you!