diff options
| author | Omar Ramirez Luna <omar.ramirez@ti.com> | 2012-02-21 20:46:20 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 12:05:38 -0800 |
| commit | 18db4fe09886691a781f3d1e4589ede0239d8ee2 (patch) | |
| tree | 5ab3246326440dff7a14f5b2dc68f77d6d4d3060 /drivers/staging/tidspbridge/core/wdt.c | |
| parent | 81a149561ed56a23ee84a783da0aec53f1077b8d (diff) | |
staging: tidspbridge: always compile dsp wdt code
In order to detect it at runtime, we need the code handling wdt
clock available at runtime to decide whether to enable or disable
based on the baseimage symbols. Default timeout has been set to 5
seconds.
Downside is that we will lose the option to set a custom timeout
for overflow, but than can be added (if needed) as part of debugfs.
Signed-off-by: Omar Ramirez <omar.ramirez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/tidspbridge/core/wdt.c')
| -rw-r--r-- | drivers/staging/tidspbridge/core/wdt.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c index 2126f597753..70055c8111e 100644 --- a/drivers/staging/tidspbridge/core/wdt.c +++ b/drivers/staging/tidspbridge/core/wdt.c @@ -25,8 +25,6 @@ #include <dspbridge/host_os.h> -#ifdef CONFIG_TIDSPBRIDGE_WDT3 - #define OMAP34XX_WDT3_BASE (L4_PER_34XX_BASE + 0x30000) static struct dsp_wdt_setting dsp_wdt; @@ -84,7 +82,7 @@ int dsp_wdt_init(void) void dsp_wdt_sm_set(void *data) { dsp_wdt.sm_wdt = data; - dsp_wdt.sm_wdt->wdt_overflow = CONFIG_TIDSPBRIDGE_WDT_TIMEOUT; + dsp_wdt.sm_wdt->wdt_overflow = 5; /* in seconds */ } @@ -128,23 +126,3 @@ void dsp_wdt_enable(bool enable) clk_disable(dsp_wdt.fclk); } } - -#else -void dsp_wdt_enable(bool enable) -{ -} - -void dsp_wdt_sm_set(void *data) -{ -} - -int dsp_wdt_init(void) -{ - return 0; -} - -void dsp_wdt_exit(void) -{ -} -#endif - |