mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - new driver for bcm281xx watchdog device - new driver for gpio based watchdog devices - remove DEFINE_PCI_DEVICE_TABLE macro for watchdog device drivers - conversion of davinci_wdt and mpc8xxx_wdt to watchdog core - improvements on davinci_wdt, at91/dt, at91sam9_wdt and s3c2410_wdt - Auto-detect IO address and expand supported chips on w836* super-I/O chipsets - core: Make dt "timeout-sec" property work on drivers w/out min/max - fix Kconfig dependencies - sirf: Remove redundant of_match_ptr helper - mach-moxart: add restart handler - hpwdt patch to display better panic information - imx2_wdt: disable watchdog timer during low power mode * git://www.linux-watchdog.org/linux-watchdog: (31 commits) watchdog: w83627hf_wdt: Reset watchdog trigger during initialization watchdog: w83627hf: Add support for W83697HF and W83697UG watchdog: w83627hf: Auto-detect IO address and supported chips watchdog: at91sam9_wdt: increase security margin on watchdog counter reset watchdog: at91sam9_wdt: avoid spurious watchdog reset during init watchdog: at91sam9_wdt: fix secs_to_ticks ARM: at91/dt: add watchdog properties to kizbox board ARM: at91/dt: add sam9 watchdog default options to SoCs watchdog: at91sam9_wdt: update device tree doc watchdog: at91sam9_wdt: better watchdog support watchdog: sp805_wdt depends also on ARM64 watchdog: mach-moxart: add restart handler watchdog: mpc8xxx_wdt convert to watchdog core watchdog: sirf: Remove redundant of_match_ptr helper watchdog: hpwdt patch to display informative string watchdog: dw_wdt: remove build dependencies watchdog: imx2_wdt: disable watchdog timer during low power mode watchdog: s3c2410_wdt: Report when the watchdog reset the system watchdog: s3c2410_wdt: use syscon regmap interface to configure pmu register watchdog: s3c2410_wdt: Handle rounding a little better for timeout ...
This commit is contained in:
Linus Torvalds
commit
17c7f85460
35 changed files with 1598 additions and 358 deletions
|
|
@ -9,11 +9,37 @@ Required properties:
|
|||
|
||||
Optional properties:
|
||||
- timeout-sec: contains the watchdog timeout in seconds.
|
||||
- interrupts : Should contain WDT interrupt.
|
||||
- atmel,max-heartbeat-sec : Should contain the maximum heartbeat value in
|
||||
seconds. This value should be less or equal to 16. It is used to
|
||||
compute the WDV field.
|
||||
- atmel,min-heartbeat-sec : Should contain the minimum heartbeat value in
|
||||
seconds. This value must be smaller than the max-heartbeat-sec value.
|
||||
It is used to compute the WDD field.
|
||||
- atmel,watchdog-type : Should be "hardware" or "software". Hardware watchdog
|
||||
use the at91 watchdog reset. Software watchdog use the watchdog
|
||||
interrupt to trigger a software reset.
|
||||
- atmel,reset-type : Should be "proc" or "all".
|
||||
"all" : assert peripherals and processor reset signals
|
||||
"proc" : assert the processor reset signal
|
||||
This is valid only when using "hardware" watchdog.
|
||||
- atmel,disable : Should be present if you want to disable the watchdog.
|
||||
- atmel,idle-halt : Should be present if you want to stop the watchdog when
|
||||
entering idle state.
|
||||
- atmel,dbg-halt : Should be present if you want to stop the watchdog when
|
||||
entering debug state.
|
||||
|
||||
Example:
|
||||
|
||||
watchdog@fffffd40 {
|
||||
compatible = "atmel,at91sam9260-wdt";
|
||||
reg = <0xfffffd40 0x10>;
|
||||
timeout-sec = <10>;
|
||||
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
|
||||
timeout-sec = <15>;
|
||||
atmel,watchdog-type = "hardware";
|
||||
atmel,reset-type = "all";
|
||||
atmel,dbg-halt;
|
||||
atmel,idle-halt;
|
||||
atmel,max-heartbeat-sec = <16>;
|
||||
atmel,min-heartbeat-sec = <0>;
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,24 @@
|
|||
DaVinci Watchdog Timer (WDT) Controller
|
||||
Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be "ti,davinci-wdt"
|
||||
- compatible : Should be "ti,davinci-wdt", "ti,keystone-wdt"
|
||||
- reg : Should contain WDT registers location and length
|
||||
|
||||
Optional properties:
|
||||
- timeout-sec : Contains the watchdog timeout in seconds
|
||||
- clocks : the clock feeding the watchdog timer.
|
||||
Needed if platform uses clocks.
|
||||
See clock-bindings.txt
|
||||
|
||||
Documentation:
|
||||
Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
|
||||
Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
|
||||
|
||||
Examples:
|
||||
|
||||
wdt: wdt@2320000 {
|
||||
compatible = "ti,davinci-wdt";
|
||||
reg = <0x02320000 0x80>;
|
||||
timeout-sec = <30>;
|
||||
clocks = <&clkwdtimer0>;
|
||||
};
|
||||
|
|
|
|||
23
Documentation/devicetree/bindings/watchdog/gpio-wdt.txt
Normal file
23
Documentation/devicetree/bindings/watchdog/gpio-wdt.txt
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
* GPIO-controlled Watchdog
|
||||
|
||||
Required Properties:
|
||||
- compatible: Should contain "linux,wdt-gpio".
|
||||
- gpios: From common gpio binding; gpio connection to WDT reset pin.
|
||||
- hw_algo: The algorithm used by the driver. Should be one of the
|
||||
following values:
|
||||
- toggle: Either a high-to-low or a low-to-high transition clears
|
||||
the WDT counter. The watchdog timer is disabled when GPIO is
|
||||
left floating or connected to a three-state buffer.
|
||||
- level: Low or high level starts counting WDT timeout,
|
||||
the opposite level disables the WDT. Active level is determined
|
||||
by the GPIO flags.
|
||||
- hw_margin_ms: Maximum time to reset watchdog circuit (milliseconds).
|
||||
|
||||
Example:
|
||||
watchdog: watchdog {
|
||||
/* ADM706 */
|
||||
compatible = "linux,wdt-gpio";
|
||||
gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
|
||||
hw_algo = "toggle";
|
||||
hw_margin_ms = <1600>;
|
||||
};
|
||||
|
|
@ -5,10 +5,29 @@ after a preset amount of time during which the WDT reset event has not
|
|||
occurred.
|
||||
|
||||
Required properties:
|
||||
- compatible : should be "samsung,s3c2410-wdt"
|
||||
- compatible : should be one among the following
|
||||
(a) "samsung,s3c2410-wdt" for Exynos4 and previous SoCs
|
||||
(b) "samsung,exynos5250-wdt" for Exynos5250
|
||||
(c) "samsung,exynos5420-wdt" for Exynos5420
|
||||
|
||||
- reg : base physical address of the controller and length of memory mapped
|
||||
region.
|
||||
- interrupts : interrupt number to the cpu.
|
||||
- samsung,syscon-phandle : reference to syscon node (This property required only
|
||||
in case of compatible being "samsung,exynos5250-wdt" or "samsung,exynos5420-wdt".
|
||||
In case of Exynos5250 and 5420 this property points to syscon node holding the PMU
|
||||
base address)
|
||||
|
||||
Optional properties:
|
||||
- timeout-sec : contains the watchdog timeout in seconds.
|
||||
|
||||
Example:
|
||||
|
||||
watchdog@101D0000 {
|
||||
compatible = "samsung,exynos5250-wdt";
|
||||
reg = <0x101D0000 0x100>;
|
||||
interrupts = <0 42 0>;
|
||||
clocks = <&clock 336>;
|
||||
clock-names = "watchdog";
|
||||
samsung,syscon-phandle = <&pmu_syscon>;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue