Skip to contentSkip to conversation

watchdog - v4.21 Merge window

GIT PULL Merged Wim Van Sebroeck 2 participants 2 messages Dec 30, 2018 – Jan 1, 2019 Watchdog device drivers

lore
Share & tools
lore

Wim Van Sebroeck

author maintainer
#0 lore raw

Hi Linus,

Please pull the watchdog changes for the v4.21 release cycle.

This series contains:
* add TQ-Systems TQMX86 watchdog driver
* add Qualcomm PM8916 watchdog driver
* w83627hf_wdt: add quirk for Inves system
* renesas_wdt: several improvements and document r8a774c0 support
* mena21_wdt, mtx-1: Convert to use GPIO descriptor
* bcm281xx, ie6xx_wdt: convert to DEFINE_SHOW_ATTRIBUTE
* documentation: add PM usage and kernel-api: don't reference removed functions
* update bindings for MT7629 SoC
* several small fixes

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

Linux 4.20-rc2 (2018-11-11 17:12:31 -0600)

are available in the git repository at:

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

for you to fetch changes up to e3c21e088f8936a004a3d9f2f4e14b3f2bdd6ea9:

watchdog: tqmx86: Add watchdog driver for the IO controller (2018-12-24 13:15:07 +0100)

----------------------------------------------------------------
linux-watchdog 4.21-rc1 tag

----------------------------------------------------------------
Andrew Lunn (1):
watchdog: tqmx86: Add watchdog driver for the IO controller

Colin Ian King (1):
watchdog: asm9260_wdt: make array mode_name static, shrinks object size

Fabrizio Castro (2):
watchdog: renesas_wdt: Fix typos
dt-bindings: watchdog: renesas-wdt: Document r8a774c0 support

Hardik Singh Rathore (1):
Watchdog: remove outdated comment

Jean Delvare (1):
watchdog: w83627hf_wdt: Add quirk for Inves system

Jerry Hoemann (3):
watchdog/hpwdt: Exclude via blacklist watchdog/hpwdt: Do not claim unsupported hardware watchdog/hpwdt: Update driver version.

Linus Walleij (2):
watchdog: mena21_wdt: Convert to GPIO descriptors
watchdog: mtx-1: Convert to use GPIO descriptor

Loic Poulain (2):
watchdog: Add pm8916 watchdog driver
dt-bindings: watchdog: Add Qualcomm PM8916 watchdog

Ryder Lee (1):
dt-bindings: watchdog: update bindings for MT7629 SoC

Tomer Maimon (1):
watchdog: npcm: Modify npcm watchdog kconfig arch parameter

Wolfram Sang (4):
watchdog: renesas_wdt: don't set divider while watchdog is running
watchdog: renesas_wdt: don't keep timer value during suspend/resume
watchdog: add documentation for PM usage
watchdog: docs: kernel-api: don't reference removed functions

Yangtao Li (3):
watchdog: cpwd: add of_node_put()
watchdog: bcm281xx: convert to DEFINE_SHOW_ATTRIBUTE
watchdog: ie6xx_wdt: convert to DEFINE_SHOW_ATTRIBUTE

 .../devicetree/bindings/watchdog/mtk-wdt.txt       |   1 +
 .../bindings/watchdog/qcom,pm8916-wdt.txt          |  28 +++
 .../devicetree/bindings/watchdog/renesas-wdt.txt   |   1 +
 Documentation/watchdog/watchdog-kernel-api.txt     |   4 -
 Documentation/watchdog/watchdog-pm.txt             |  19 ++
 arch/mips/alchemy/board-mtx1.c                     |  18 +-
 drivers/watchdog/Kconfig                           |  22 ++-
 drivers/watchdog/Makefile                          |   2 +
 drivers/watchdog/asm9260_wdt.c                     |   2 +-
 drivers/watchdog/bcm_kona_wdt.c                    |  16 +-
 drivers/watchdog/cpwd.c                            |   2 +
 drivers/watchdog/hpwdt.c                           |  15 +-
 drivers/watchdog/ie6xx_wdt.c                       |  16 +-
 drivers/watchdog/mena21_wdt.c                      |  73 ++++---
 drivers/watchdog/mtx-1_wdt.c                       |  19 +-
 drivers/watchdog/pm8916_wdt.c                      | 211 +++++++++++++++++++++
 drivers/watchdog/renesas_wdt.c                     |  24 +--
 drivers/watchdog/tqmx86_wdt.c                      | 126 ++++++++++++
 drivers/watchdog/w83627hf_wdt.c                    |  38 +++-
 include/linux/watchdog.h                           |   3 -
 20 files changed, 529 insertions(+), 111 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt
 create mode 100644 Documentation/watchdog/watchdog-pm.txt
 create mode 100644 drivers/watchdog/pm8916_wdt.c
 create mode 100644 drivers/watchdog/tqmx86_wdt.c

----------------------------------------------------------------

Kind regards and best wishes,
Wim.

merge bot Merged
#1 lore raw
The pull request you sent on Sun, 30 Dec 2018 12:24:45 +0100:

The pull request you sent on Sun, 30 Dec 2018 12:24:45 +0100:

Quoted 1 line

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

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/115502a6f31d84d8172a71283aaea266302a8ad5

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker