arm: davinci: remove unused watchdog functions

The davinci_hw_watchdog_ functions are defined but never called from
anywhere. Commit 881ae794b93b ("calimain: remove board") eliminated the
last call to these functions.

Signed-off-by: Emil Kronborg <emil.kronborg@protonmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/mach-davinci/include/mach/timer_defs.h b/arch/arm/mach-davinci/include/mach/timer_defs.h
index 110e67e454cea6233f908113e6a97a368c36f86b..7b21f2599930ea43bc3eb20f8187568e1ae501fb 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/timer_defs.h
+++ b/arch/arm/mach-davinci/include/mach/timer_defs.h
@@ -36,8 +36,4 @@ struct davinci_timer {
 #define DV_WDT_ENABLE_SYS_RESET                0x00020000
 #define DV_WDT_TRIGGER_SYS_RESET       0x00020002
 
-#ifdef CONFIG_HW_WATCHDOG
-void davinci_hw_watchdog_enable(void);
-void davinci_hw_watchdog_reset(void);
-#endif
 #endif /* _TIMER_DEFS_H_ */

diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c
index f2990f7187734f686124ad9ae42abfc2d18ed779..474dc6b1abd945c7708bddc03420667406b1b21d 100644 (file)
--- a/arch/arm/mach-davinci/timer.c
+++ b/arch/arm/mach-davinci/timer.c
@@ -98,34 +98,3 @@ ulong get_tbclk(void)
 {
        return gd->arch.timer_rate_hz;
 }
-
-#ifdef CONFIG_HW_WATCHDOG
-static struct davinci_timer * const wdttimer =
-       (struct davinci_timer *)CONFIG_SYS_WDTTIMERBASE;
-
-/*
- * See prufw2.pdf for using Timer as a WDT
- */
-void davinci_hw_watchdog_enable(void)
-{
-       writel(0x0, &wdttimer->tcr);
-       writel(0x0, &wdttimer->tgcr);
-       /* TIMMODE = 2h */
-       writel(0x08 | 0x03 | ((TIM_CLK_DIV - 1) << 8), &wdttimer->tgcr);
-       writel(CONFIG_SYS_WDT_PERIOD_LOW, &wdttimer->prd12);
-       writel(CONFIG_SYS_WDT_PERIOD_HIGH, &wdttimer->prd34);
-       writel(2 << 22, &wdttimer->tcr);
-       writel(0x0, &wdttimer->tim12);
-       writel(0x0, &wdttimer->tim34);
-       /* set WDEN bit, WDKEY 0xa5c6 */
-       writel(0xa5c64000, &wdttimer->wdtcr);
-       /* clear counter register */
-       writel(0xda7e4000, &wdttimer->wdtcr);
-}
-
-void davinci_hw_watchdog_reset(void)
-{
-       writel(0xa5c64000, &wdttimer->wdtcr);
-       writel(0xda7e4000, &wdttimer->wdtcr);
-}
-#endif