diff options
| author | Timo Kokkonen <timo.t.kokkonen@nokia.com> | 2009-03-27 15:42:17 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2009-06-20 20:39:43 +0200 |
| commit | 80e45b1e9edbca746618724d5b0a31500bdb6f39 (patch) | |
| tree | 3da65f7db34c0a6ffa98447a99165da01ca63a2d /drivers/mfd | |
| parent | [WATCHDOG] U300 COH 901 327 watchdog driver (diff) | |
| download | linux-80e45b1e9edbca746618724d5b0a31500bdb6f39.tar.xz linux-80e45b1e9edbca746618724d5b0a31500bdb6f39.zip | |
[WATCHDOG] twl4030 watchdog driver
Implementation of twl4030 watchdog driver.
Signed-off-by: Timo Kokkonen <timo.t.kokkonen@nokia.com>
Signed-off-by: Atal Shargorodsky <ext-atal.shargorodsky@nokia.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index cd1008c19cd7..ca54996ffd0e 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -101,6 +101,12 @@ #define twl_has_usb() false #endif +#if defined(CONFIG_TWL4030_WATCHDOG) || \ + defined(CONFIG_TWL4030_WATCHDOG_MODULE) +#define twl_has_watchdog() true +#else +#define twl_has_watchdog() false +#endif /* Triton Core internal information (BEGIN) */ @@ -526,6 +532,12 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) usb_transceiver = child; } + if (twl_has_watchdog()) { + child = add_child(0, "twl4030_wdt", NULL, 0, false, 0, 0); + if (IS_ERR(child)) + return PTR_ERR(child); + } + if (twl_has_regulator()) { /* child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1); |