From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 7 Apr 2011 04:11:31 +0000 (+0800)
Subject: rk29: move some common define to cru.h
X-Git-Tag: firefly_0821_release~10551
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=915f8b9eae3a9f68635bfd2e17fc0c49ee01ee02;p=firefly-linux-kernel-4.4.55.git

rk29: move some common define to cru.h
---

diff --git a/arch/arm/mach-rk29/include/mach/cru.h b/arch/arm/mach-rk29/include/mach/cru.h
index caf955722dc4..7ec6fa0199a5 100644
--- a/arch/arm/mach-rk29/include/mach/cru.h
+++ b/arch/arm/mach-rk29/include/mach/cru.h
@@ -302,4 +302,8 @@ enum cru_soft_reset {
 extern volatile u32 cru_clkgate3_con_mirror;
 void cru_set_soft_reset(enum cru_soft_reset idx, bool on);
 
+#define LOOPS_PER_USEC	13
+#define LOOPS_PER_MSEC	12000
+#define LOOP(loops) do { int i = loops; barrier(); while (i--) barrier(); } while (0)
+
 #endif
diff --git a/arch/arm/mach-rk29/pm.c b/arch/arm/mach-rk29/pm.c
index bdadd7cbed9e..62a5bb938e84 100755
--- a/arch/arm/mach-rk29/pm.c
+++ b/arch/arm/mach-rk29/pm.c
@@ -29,9 +29,6 @@
 
 static unsigned long save_sp;
 
-#define LOOPS_PER_USEC	13
-#define LOOP(loops) do { int i = loops; barrier(); while (i--) barrier(); } while (0)
-
 static inline void delay_500ns(void)
 {
 	LOOP(LOOPS_PER_USEC);
diff --git a/arch/arm/mach-rk29/reset.c b/arch/arm/mach-rk29/reset.c
index 222c7959fb4f..24773683fde0 100755
--- a/arch/arm/mach-rk29/reset.c
+++ b/arch/arm/mach-rk29/reset.c
@@ -21,10 +21,6 @@
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
 
-#define LOOPS_PER_USEC	13
-#define LOOPS_PER_MSEC	12000
-#define LOOP(loops) do { int i = loops; barrier(); while (i--) barrier(); } while (0)
-
 static void  pwm2gpiodefault(void)
 {
 	#define     REG_FILE_BASE_ADDR         RK29_GRF_BASE