Commit 6755f456 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-watchdog-5.11-rc1' of git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog updates from Wim Van Sebroeck:

 - Removal of the pnx83xx driver

 - Add a binding for A100's watchdog controller

 - Add Rockchip compatibles to snps,dw-wdt.yaml

 - hpwdt: Disable NMI in Crash Kernel

 - Fix potential dereferencing of null pointer in watchdog_core

 - Several other small fixes and improvements

* tag 'linux-watchdog-5.11-rc1' of git://www.linux-watchdog.org/linux-watchdog: (23 commits)
  watchdog: convert comma to semicolon
  watchdog: iTCO_wdt: use dev_*() instead of pr_*() for logging
  dt-binding: watchdog: add Rockchip compatibles to snps,dw-wdt.yaml
  watchdog: coh901327: add COMMON_CLK dependency
  dt-bindings: watchdog: sun4i: Add A100 compatible
  watchdog: qcom: Avoid context switch in restart handler
  watchdog: iTCO_wdt: use module_platform_device() macro
  watchdog: Fix potential dereferencing of null pointer
  watchdog: wdat_wdt: Fix missing kerneldoc reported by W=1
  watchdog/hpwdt: Reflect changes
  watchdog/hpwdt: Disable NMI in Crash Kernel
  wdt: sp805: add watchdog_stop on reboot
  watchdog: sbc_fitpc2_wdt: add __user annotations
  watchdog: geodewdt: remove unneeded break
  watchdog: rti-wdt: fix reference leak in rti_wdt_probe
  watchdog: qcom_wdt: set WDOG_HW_RUNNING bit when appropriate
  watchdog: remove pnx83xx driver
  watchdog: stm32_iwdg: don't print an error on probe deferral
  watchdog: sprd: change to use usleep_range() instead of busy loop
  watchdog: sprd: check busy bit before new loading rather than after that
  ...
parents 614cb589 0b9491b6

Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ properties: 
      - items:

          - const: allwinner,sun50i-a64-wdt

          - const: allwinner,sun6i-a31-wdt

      - items:

          - const: allwinner,sun50i-a100-wdt

          - const: allwinner,sun6i-a31-wdt

      - items:

          - const: allwinner,sun50i-h6-wdt

          - const: allwinner,sun6i-a31-wdt

Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

+9 −1
Original line number Diff line number Diff line
@@ -14,7 +14,15 @@ maintainers: 


properties:

  compatible:

    const: snps,dw-wdt

    oneOf:

      - const: snps,dw-wdt

      - items:

          - enum:

              - rockchip,rk3066-wdt

              - rockchip,rk3188-wdt

              - rockchip,rk3288-wdt

              - rockchip,rk3368-wdt

          - const: snps,dw-wdt



  reg:

    maxItems: 1

drivers/watchdog/Kconfig

+3 −11
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ config ARM_SBSA_WATCHDOG 
config ARMADA_37XX_WATCHDOG

	tristate "Armada 37xx watchdog"

	depends on ARCH_MVEBU || COMPILE_TEST

	depends on HAS_IOMEM

	select MFD_SYSCON

	select WATCHDOG_CORE

	help
@@ -631,7 +632,7 @@ config SUNXI_WATCHDOG 


config COH901327_WATCHDOG

	bool "ST-Ericsson COH 901 327 watchdog"

	depends on ARCH_U300 || (ARM && COMPILE_TEST)

	depends on ARCH_U300 || (ARM && COMMON_CLK && COMPILE_TEST)

	default y if MACH_U300

	select WATCHDOG_CORE

	help
@@ -789,6 +790,7 @@ config MOXART_WDT 


config SIRFSOC_WATCHDOG

	tristate "SiRFSOC watchdog"

	depends on HAS_IOMEM

	depends on ARCH_SIRF || COMPILE_TEST

	select WATCHDOG_CORE

	default y
@@ -1696,16 +1698,6 @@ config WDT_MTX1 
	  Hardware driver for the MTX-1 boards. This is a watchdog timer that

	  will reboot the machine after a 100 seconds timer expired.



config PNX833X_WDT

	tristate "PNX833x Hardware Watchdog"

	depends on SOC_PNX8335

	depends on BROKEN

	help

	  Hardware driver for the PNX833x's watchdog. This is a

	  watchdog timer that will reboot the machine after a programmable

	  timer has expired and no process has written to /dev/watchdog during

	  that time.



config SIBYTE_WDOG

	tristate "Sibyte SoC hardware watchdog"

	depends on CPU_SB1 || (MIPS && COMPILE_TEST)

drivers/watchdog/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o 
obj-$(CONFIG_INDYDOG) += indydog.o

obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o

obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o

obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o

obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o

obj-$(CONFIG_AR7_WDT) += ar7_wdt.o

obj-$(CONFIG_TXX9_WDT) += txx9wdt.o

drivers/watchdog/geodewdt.c

+0 −2
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ static long geodewdt_ioctl(struct file *file, unsigned int cmd, 
	case WDIOC_GETSUPPORT:

		return copy_to_user(argp, &ident,

				    sizeof(ident)) ? -EFAULT : 0;

		break;



	case WDIOC_GETSTATUS:

	case WDIOC_GETBOOTSTATUS:

		return put_user(0, p);

CRA Git | Maintained and supported by SUSTech CRA and CCSE