From: 黄涛 <huangtao@rock-chips.com>
Date: Fri, 23 Aug 2013 10:41:01 +0000 (+0800)
Subject: rk3026: reset: reduce call dsb for save sram space
X-Git-Tag: firefly_0821_release~6698
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f1e0696f283bd8b5dc70cb753aa294135066662f;p=firefly-linux-kernel-4.4.55.git

rk3026: reset: reduce call dsb for save sram space
---

diff --git a/arch/arm/mach-rk3026/reset.c b/arch/arm/mach-rk3026/reset.c
index 24cce14aa85e..ce028b16133e 100644
--- a/arch/arm/mach-rk3026/reset.c
+++ b/arch/arm/mach-rk3026/reset.c
@@ -10,7 +10,7 @@
 //#define DEBUG // for jtag debug
 
 #define cru_readl(offset)     readl_relaxed(RK30_CRU_BASE + offset)
-#define cru_writel(v, offset) do { writel_relaxed(v, RK30_CRU_BASE + offset); dsb(); } while (0)
+#define cru_writel(v, offset) do { writel_relaxed(v, RK30_CRU_BASE + offset); } while (0)
 #define grf_readl(offset)     readl_relaxed(RK30_GRF_BASE + offset)
 #define grf_writel(v, offset) do { writel_relaxed(v, RK30_GRF_BASE + offset); dsb(); } while (0)
 
@@ -41,6 +41,7 @@ static void __sramfunc __noreturn soft_reset(void)
 {
 	/* pll enter slow mode */
 	cru_writel(0xffff0000, CRU_MODE_CON);
+	dsb();
 
 	/* restore clock select and divide */
 	cru_writel(0xffff0200, CRU_CLKSELS_CON(0));
@@ -71,6 +72,7 @@ static void __sramfunc __noreturn soft_reset(void)
 	cru_writel(0xffff0001, CRU_CLKSELS_CON(31));
 	cru_writel(0xffff0303, CRU_CLKSELS_CON(32));
 	cru_writel(0xffff0003, CRU_CLKSELS_CON(34));
+	dsb();
 
 	/* idle request PERI/VIO/VPU/GPU */
 	grf_writel(0x1e00ffff, GRF_SOC_CON2);
@@ -101,6 +103,7 @@ static void __sramfunc __noreturn soft_reset(void)
 #else
 	cru_writel(0x1fe0ffff, CRU_SOFTRSTS_CON(0)); // CORE_SRST_WDT_SEL/MCORE/CORE0/CORE1/ACLK_CORE/STRC_SYS_AXI/L2C
 #endif
+	dsb();
 
 	sram_udelay(1000);
 
@@ -113,6 +116,7 @@ static void __sramfunc __noreturn soft_reset(void)
 	cru_writel(0xffff0000, CRU_SOFTRSTS_CON(6));
 	cru_writel(0xffff0000, CRU_SOFTRSTS_CON(7));
 	cru_writel(0xffff0000, CRU_SOFTRSTS_CON(8));
+	dsb();
 
 	/* disable idle request */
 	grf_writel(0x3f000000, GRF_SOC_CON2);
@@ -126,6 +130,7 @@ static void __sramfunc __noreturn soft_reset(void)
 #endif
 
 	cru_writel(0x801cffff, CRU_SOFTRSTS_CON(0)); // MCORE/CORE0/CORE1/L2C
+	dsb();
 
 	while (1);
 }