From 56bc7a1949d3c088b2eebcf03d42d299e4bc5b64 Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Mon, 17 Jun 2013 23:45:40 +0900 Subject: [PATCH] ARM: SAMSUNG: Remove legacy watchdog reset code Since all platforms have been moved to the new watchdog reset driver, the legacy code can be removed safely. Signed-off-by: Tomasz Figa Tested-by: Sylwester Nawrocki Signed-off-by: Kukjin Kim --- .../include/plat/watchdog-reset.h | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/arch/arm/plat-samsung/include/plat/watchdog-reset.h b/arch/arm/plat-samsung/include/plat/watchdog-reset.h index 31a05720a005..0386b8f76623 100644 --- a/arch/arm/plat-samsung/include/plat/watchdog-reset.h +++ b/arch/arm/plat-samsung/include/plat/watchdog-reset.h @@ -13,41 +13,6 @@ #ifndef __PLAT_SAMSUNG_WATCHDOG_RESET_H #define __PLAT_SAMSUNG_WATCHDOG_RESET_H -#include -#include -#include - -#include -#include -#include -#include - -static inline void arch_wdt_reset(void) -{ - printk("arch_reset: attempting watchdog reset\n"); - - __raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */ - - if (!IS_ERR(s3c2410_wdtclk)) - clk_enable(s3c2410_wdtclk); - - /* put initial values into count and data */ - __raw_writel(0x80, S3C2410_WTCNT); - __raw_writel(0x80, S3C2410_WTDAT); - - /* set the watchdog to go and reset... */ - __raw_writel(S3C2410_WTCON_ENABLE|S3C2410_WTCON_DIV16|S3C2410_WTCON_RSTEN | - S3C2410_WTCON_PRESCALE(0x20), S3C2410_WTCON); - - /* wait for reset to assert... */ - mdelay(500); - - printk(KERN_ERR "Watchdog reset failed to assert reset\n"); - - /* delay to allow the serial port to show the message */ - mdelay(50); -} - extern void samsung_wdt_reset(void); extern void samsung_wdt_reset_of_init(void); extern void samsung_wdt_reset_init(void __iomem *base); -- 2.30.2