Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cba5ef8 authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C: Move watchdog system reset to own file. 



Move the watchdog reset code from <mach/system-reset.h> to
a new file <plat/watchdog-reset.h> as this code is needed
by both s3c2410, s3c64xx and soon-to-be added s3c24a0.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 3f7ea467

arch/arm/mach-s3c2410/include/mach/system-reset.h

+2 −34
Original line number Diff line number Diff line
@@ -11,21 +11,13 @@ 
*/



#include <mach/hardware.h>

#include <linux/io.h>



#include <plat/regs-watchdog.h>

#include <mach/regs-clock.h>



#include <linux/clk.h>

#include <linux/err.h>

#include <plat/watchdog-reset.h>



extern void (*s3c24xx_reset_hook)(void);



static void

arch_reset(char mode, const char *cmd)

{

	struct clk *wdtclk;



	if (mode == 's') {

		cpu_reset(0);

	}
@@ -33,31 +25,7 @@ arch_reset(char mode, const char *cmd) 
	if (s3c24xx_reset_hook)

		s3c24xx_reset_hook();



	printk("arch_reset: attempting watchdog reset\n");



	__raw_writel(0, S3C2410_WTCON);	  /* disable watchdog, to be safe  */



	wdtclk = clk_get(NULL, "watchdog");

	if (!IS_ERR(wdtclk)) {

		clk_enable(wdtclk);

	} else

		printk(KERN_WARNING "%s: warning: cannot get watchdog clock\n", __func__);



	/* 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);

	arch_wdt_reset();



	/* we'll take a jump through zero as a poor second */

	cpu_reset(0);

arch/arm/plat-s3c/include/plat/watchdog-reset.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/* arch/arm/plat-s3c/include/plat/watchdog-reset.h

 *

 * Copyright (c) 2008 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * S3C2410 - System define for arch_reset() function

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#include <plat/regs-watchdog.h>



#include <linux/clk.h>

#include <linux/err.h>

#include <linux/io.h>



static inline void arch_wdt_reset(void)

{

	struct clk *wdtclk;



	printk("arch_reset: attempting watchdog reset\n");



	__raw_writel(0, S3C2410_WTCON);	  /* disable watchdog, to be safe  */



	wdtclk = clk_get(NULL, "watchdog");

	if (!IS_ERR(wdtclk)) {

		clk_enable(wdtclk);

	} else

		printk(KERN_WARNING "%s: warning: cannot get watchdog clock\n", __func__);



	/* 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);

}