diff options
author | Timo Kokkonen <timo.t.kokkonen@nokia.com> | 2009-03-27 10:42:17 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2009-06-20 14:39:43 -0400 |
commit | 80e45b1e9edbca746618724d5b0a31500bdb6f39 (patch) | |
tree | 3da65f7db34c0a6ffa98447a99165da01ca63a2d /drivers/mfd/twl4030-core.c | |
parent | 01480701d5cef5b3b0f8406d2eab1eaff82f9d5c (diff) |
[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/twl4030-core.c')
-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 @@ | |||
101 | #define twl_has_usb() false | 101 | #define twl_has_usb() false |
102 | #endif | 102 | #endif |
103 | 103 | ||
104 | #if defined(CONFIG_TWL4030_WATCHDOG) || \ | ||
105 | defined(CONFIG_TWL4030_WATCHDOG_MODULE) | ||
106 | #define twl_has_watchdog() true | ||
107 | #else | ||
108 | #define twl_has_watchdog() false | ||
109 | #endif | ||
104 | 110 | ||
105 | /* Triton Core internal information (BEGIN) */ | 111 | /* Triton Core internal information (BEGIN) */ |
106 | 112 | ||
@@ -526,6 +532,12 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) | |||
526 | usb_transceiver = child; | 532 | usb_transceiver = child; |
527 | } | 533 | } |
528 | 534 | ||
535 | if (twl_has_watchdog()) { | ||
536 | child = add_child(0, "twl4030_wdt", NULL, 0, false, 0, 0); | ||
537 | if (IS_ERR(child)) | ||
538 | return PTR_ERR(child); | ||
539 | } | ||
540 | |||
529 | if (twl_has_regulator()) { | 541 | if (twl_has_regulator()) { |
530 | /* | 542 | /* |
531 | child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1); | 543 | child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1); |