Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 833e6834 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog updates from Wim Van Sebroeck:
 - lots of devm_ conversions and cleanup
 - platform_set_drvdata cleanups
 - s3c2410: dev_err/dev_info + dev_pm_ops
 - watchdog_core: don't try to stop device if not running fix
 - wdrtas: use print_hex_dump
 - xilinx cleanups
 - orion_wdt fixes
 - softdog cleanup
 - hpwdt: check on UEFI bits
 - deletion of mpcore_wdt driver
 - addition of broadcom BCM2835 watchdog timer driver
 - addition of MEN A21 watcdog devices

* git://www.linux-watchdog.org/linux-watchdog: (38 commits)
  watchdog: hpwdt: Add check for UEFI bits
  watchdog: softdog: remove replaceable ping operation
  watchdog: New watchdog driver for MEN A21 watchdogs
  Watchdog: fix clearing of the watchdog interrupt
  Watchdog: allow orion_wdt to be built for Dove
  watchdog: Add Broadcom BCM2835 watchdog timer driver
  watchdog: delete mpcore_wdt driver
  watchdog: xilinx: Setup the origin compatible string
  watchdog: xilinx: Fix driver header
  watchdog: wdrtas: don't use custom version of print_hex_dump
  watchdog: core: don't try to stop device if not running
  watchdog: jz4740: Pass device to clk_get
  watchdog: twl4030: Remove redundant platform_set_drvdata()
  watchdog: mpcore: Remove redundant platform_set_drvdata()
  watchdog: da9055: use platform_{get,set}_drvdata()
  watchdog: da9052: use platform_{get,set}_drvdata()
  watchdog: cpwd: use platform_{get,set}_drvdata()
  watchdog: s3c2410_wdt: convert s3c2410wdt to dev_pm_ops
  watchdog: s3c2410_wdt: use dev_err()/dev_info() instead of pr_err()/pr_info()
  watchdog: wm831x: use platform_{get,set}_drvdata()
  ...
parents c5524413 cce78da7

Documentation/devicetree/bindings/gpio/men-a021-wdt.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Bindings for MEN A21 Watchdog device connected to GPIO lines



Required properties:

- compatible: "men,a021-wdt"

- gpios: Specifies the pins that control the Watchdog, order:

  1: Watchdog enable

  2: Watchdog fast-mode

  3: Watchdog trigger

  4: Watchdog reset cause bit 0

  5: Watchdog reset cause bit 1

  6: Watchdog reset cause bit 2



Optional properties:

- None



Example:

	watchdog {

		compatible ="men,a021-wdt";

		gpios = <&gpio3 9  1	/* WD_EN */

			 &gpio3 10 1	/* WD_FAST */

			 &gpio3 11 1	/* WD_TRIG */

			 &gpio3 6  1	/* RST_CAUSE[0] */

			 &gpio3 7  1	/* RST_CAUSE[1] */

			 &gpio3 8  1>;	/* RST_CAUSE[2] */

	};

Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt

+5 −0
Original line number Diff line number Diff line
@@ -5,9 +5,14 @@ Required properties: 
- compatible : should be "brcm,bcm2835-pm-wdt"

- reg : Specifies base physical address and size of the registers.



Optional properties:



- timeout-sec   : Contains the watchdog timeout in seconds



Example:



watchdog {

	compatible = "brcm,bcm2835-pm-wdt";

	reg = <0x7e100000 0x28>;

	timeout-sec = <10>;

};

Documentation/watchdog/watchdog-parameters.txt

+0 −8
Original line number Diff line number Diff line
@@ -194,14 +194,6 @@ reset: Watchdog Interrupt/Reset Mode. 0 = interrupt, 1 = reset 
nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

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

mpcore_wdt:

mpcore_margin: MPcore timer margin in seconds.

	(0 < mpcore_margin < 65536, default=60)

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

mpcore_noboot: MPcore watchdog action, set to 1 to ignore reboots,

	0 to reboot (default=0

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

mv64x60_wdt:

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -5387,6 +5387,12 @@ F: drivers/mtd/ 
F:	include/linux/mtd/

F:	include/uapi/mtd/



MEN A21 WATCHDOG DRIVER

M:  	Johannes Thumshirn <johannes.thumshirn@men.de>

L:	linux-watchdog@vger.kernel.org

S:	Supported

F:	drivers/watchdog/mena21_wdt.c



METAG ARCHITECTURE

M:	James Hogan <james.hogan@imgtec.com>

S:	Supported

arch/arm/configs/spear13xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ CONFIG_GPIO_SYSFS=y 
CONFIG_GPIO_PL061=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_MPCORE_WATCHDOG=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

# CONFIG_USB_DEVICE_CLASS is not set