コミット: 99ac3a5e408ddb63a658b4668da8f8761ca1bfc0 - linux_3.x_apsh4a0a (git)

linux-3.0.x for AP-SH4A-0A Board

コミットメタ情報

• リビジョン: 99ac3a5e408ddb63a658b4668da8f8761ca1bfc0 (tree)
• 日時: 2011-08-22 22:50:00
• 作者: Kyungmin Park <kyungmin.park@sams...>
• コミッター: Nicolas Pitre

ログメッセージ

ARM: EXYNOS4: Add restart hook for proper reboot

This is required to use SWRESET.

Signed-off-by: Kyungmin Park <[e-mail]>
Signed-off-by: Kukjin Kim <[e-mail]>
(cherry picked from commit d2edddf2b25863ec0893635662b0832f9965b543)

変更サマリ

• modified: arch/arm/mach-exynos4/cpu.c
• modified: arch/arm/mach-exynos4/include/mach/regs-pmu.h

差分

--- a/arch/arm/mach-exynos4/cpu.c
+++ b/arch/arm/mach-exynos4/cpu.c
@@ -24,8 +24,10 @@
 #include <plat/devs.h>
 #include <plat/fimc-core.h>
 #include <plat/iic-core.h>
+#include <plat/reset.h>
 
 #include <mach/regs-irq.h>
+#include <mach/regs-pmu.h>
 
 extern int combiner_init(unsigned int combiner_nr, void __iomem *base,
 			 unsigned int irq_start);
@@ -114,6 +116,11 @@ static void exynos4_idle(void)
 	local_irq_enable();
 }
 
+static void exynos4_sw_reset(void)
+{
+	__raw_writel(0x1, S5P_SWRESET);
+}
+
 /*
  * exynos4_map_io
  *
@@ -222,5 +229,8 @@ int __init exynos4_init(void)
 	/* set idle function */
 	pm_idle = exynos4_idle;
 
+	/* set sw_reset function */
+	s5p_reset_hook = exynos4_sw_reset;
+
 	return sysdev_register(&exynos4_sysdev);
 }

--- a/arch/arm/mach-exynos4/include/mach/regs-pmu.h
+++ b/arch/arm/mach-exynos4/include/mach/regs-pmu.h
@@ -29,6 +29,8 @@
 #define S5P_USE_STANDBY_WFE1			(1 << 25)
 #define S5P_USE_MASK				((0x3 << 16) | (0x3 << 24))
 
+#define S5P_SWRESET				S5P_PMUREG(0x0400)
+
 #define S5P_WAKEUP_STAT				S5P_PMUREG(0x0600)
 #define S5P_EINT_WAKEUP_MASK			S5P_PMUREG(0x0604)
 #define S5P_WAKEUP_MASK				S5P_PMUREG(0x0608)