aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJongpill Lee <boyko.lee@samsung.com>2010-07-23 08:33:58 -0400
committerKukjin Kim <kgene.kim@samsung.com>2010-08-05 05:30:22 -0400
commit0fdb480e7fb1ecdd4076ddf8b6ab16b0d77406c1 (patch)
tree5538775775e6559b3e6f254d2a7ddf158d950a09 /arch/arm
parent9a423b0ffdf7c75d852056447202e64822263c6a (diff)
ARM: S5P: Add s5p_reset_hook() for perform reset using SWRESET on S5P SoCs
This patch adds s5p_reset_hook() which includes software reset by using SWRESET. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-s5p/include/plat/reset.h16
-rw-r--r--arch/arm/plat-s5p/include/plat/system-reset.h11
2 files changed, 25 insertions, 2 deletions
diff --git a/arch/arm/plat-s5p/include/plat/reset.h b/arch/arm/plat-s5p/include/plat/reset.h
new file mode 100644
index 000000000000..335e97812eed
--- /dev/null
+++ b/arch/arm/plat-s5p/include/plat/reset.h
@@ -0,0 +1,16 @@
1/* linux/arch/arm/plat-s5p/include/plat/reset.h
2 *
3 * Copyright (c) 2010 Samsung Electronics Co., Ltd.
4 * http://www.samsung.com/
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9*/
10
11#ifndef __ASM_PLAT_S5P_RESET_H
12#define __ASM_PLAT_S5P_RESET_H __FILE__
13
14extern void (*s5p_reset_hook)(void);
15
16#endif /* __ASM_PLAT_S5P_RESET_H */
diff --git a/arch/arm/plat-s5p/include/plat/system-reset.h b/arch/arm/plat-s5p/include/plat/system-reset.h
index 7f76a164c20c..f307f34e6422 100644
--- a/arch/arm/plat-s5p/include/plat/system-reset.h
+++ b/arch/arm/plat-s5p/include/plat/system-reset.h
@@ -14,10 +14,17 @@
14 14
15#include <plat/watchdog-reset.h> 15#include <plat/watchdog-reset.h>
16 16
17void (*s5p_reset_hook)(void);
18
17static void arch_reset(char mode, const char *cmd) 19static void arch_reset(char mode, const char *cmd)
18{ 20{
19 /* Perform reset using Watchdog reset. 21 /* SWRESET support in s5p_reset_hook() */
20 * SWRESET support will be added later. 22
23 if (s5p_reset_hook)
24 s5p_reset_hook();
25
26 /* Perform reset using Watchdog reset
27 * if there is no s5p_reset_hook()
21 */ 28 */
22 29
23 arch_wdt_reset(); 30 arch_wdt_reset();