Merge tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[sfrench/cifs-2.6.git] / arch / arm / mach-lpc32xx / common.c

diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c
index 716e83eb1db8ec1fe31bce19c318228ee2ce515b..5b7a1e78c3a5ed37e24506585d1d53d3551b5d82 100644 (file)
--- a/arch/arm/mach-lpc32xx/common.c
+++ b/arch/arm/mach-lpc32xx/common.c
@@ -194,21 +194,6 @@ void __init lpc32xx_map_io(void)
        iotable_init(lpc32xx_io_desc, ARRAY_SIZE(lpc32xx_io_desc));
 }
 
-void lpc23xx_restart(enum reboot_mode mode, const char *cmd)
-{
-       /* Make sure WDT clocks are enabled */
-       __raw_writel(LPC32XX_CLKPWR_PWMCLK_WDOG_EN,
-               LPC32XX_CLKPWR_TIMER_CLK_CTRL);
-
-       /* Instant assert of RESETOUT_N with pulse length 1mS */
-       __raw_writel(13000, io_p2v(LPC32XX_WDTIM_BASE + 0x18));
-       __raw_writel(0x70, io_p2v(LPC32XX_WDTIM_BASE + 0xC));
-
-       /* Wait for watchdog to reset system */
-       while (1)
-               ;
-}
-
 static int __init lpc32xx_check_uid(void)
 {
        u32 uid[4];