From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 28 Mar 2012 01:53:21 +0000 (+0800)
Subject: rk30: reboot use the second global software reset
X-Git-Tag: firefly_0821_release~9560^2~30
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=081b9f69e5a88cff1dd5fe1cbcf77f8017961797;p=firefly-linux-kernel-4.4.55.git

rk30: reboot use the second global software reset
---

diff --git a/arch/arm/mach-rk30/reset.c b/arch/arm/mach-rk30/reset.c
index 4b677d04e971..b826ad78917a 100644
--- a/arch/arm/mach-rk30/reset.c
+++ b/arch/arm/mach-rk30/reset.c
@@ -1,7 +1,16 @@
+#include <linux/io.h>
+#include <linux/kernel.h>
 #include <mach/system.h>
+#include <mach/cru.h>
+#include <mach/iomux.h>
 
 static void rk30_arch_reset(char mode, const char *cmd)
 {
+	/* disable remap */
+	writel_relaxed(1 << (12 + 16), RK30_GRF_BASE + GRF_SOC_CON0);
+	dsb();
+	writel_relaxed(0xeca8, RK30_CRU_BASE + CRU_GLB_SRST_SND);
+	dsb();
 }
 
 void (*arch_reset)(char, const char *) = rk30_arch_reset;