diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 17:46:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 17:46:14 -0800 |
| commit | ef05e9b9602660fd468e05f5fbe8f08ad7418b73 (patch) | |
| tree | 7de3ceb677e7bccb997e3ad80be09b99f528aa42 /arch | |
| parent | 080a62e2ceec28163194facb837d6388983aae5d (diff) | |
| parent | 8899b8d93ec64b7a8e54807a68a958e1206535e2 (diff) | |
| download | linux-ef05e9b9602660fd468e05f5fbe8f08ad7418b73.tar.gz linux-ef05e9b9602660fd468e05f5fbe8f08ad7418b73.tar.bz2 linux-ef05e9b9602660fd468e05f5fbe8f08ad7418b73.zip | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
"This fixes some small errors in the new da9055 driver, eliminates a
compiler warning and adds DT support for the twl4030_wdt driver (so
that we can have multiple watchdogs with DT on the omap platforms)."
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: twl4030_wdt: add DT support
watchdog: omap_wdt: eliminate unused variable and a compiler warning
watchdog: da9055: Don't update wdt_dev->timeout in da9055_wdt_set_timeout error path
watchdog: da9055: Fix invalid free of devm_ allocated data
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/twl4030.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index 63411b036932..ed0bc9546837 100644 --- a/arch/arm/boot/dts/twl4030.dtsi +++ b/arch/arm/boot/dts/twl4030.dtsi @@ -19,6 +19,10 @@ interrupts = <11>; }; + watchdog { + compatible = "ti,twl4030-wdt"; + }; + vdac: regulator-vdac { compatible = "ti,twl4030-vdac"; regulator-min-microvolt = <1800000>; |