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 caf955722dc41aad0908891abf62317c3f46d7b3..7ec6fa0199a5de85ae9994629217c6cebc96d1b4 100644 (file)
--- 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 bdadd7cbed9ee764d579312425176867f6ca2643..62a5bb938e84f7a630ee5d7caab7e336f3144e2c 100755 (executable)
--- 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 222c7959fb4ffb4810d47131c997b66e96784df8..24773683fde05b27e0c669968e894659d089710b 100755 (executable)
--- a/arch/arm/mach-rk29/reset.c
+++ b/arch/arm/mach-rk29/reset.c
@@ -21,10 +21,6 @@
 #include <asm/tlbflush.h>\r
 #include <asm/cacheflush.h>\r
 \r
-#define LOOPS_PER_USEC 13\r
-#define LOOPS_PER_MSEC 12000\r
-#define LOOP(loops) do { int i = loops; barrier(); while (i--) barrier(); } while (0)\r
-\r
 static void  pwm2gpiodefault(void)\r
 {\r
        #define     REG_FILE_BASE_ADDR         RK29_GRF_BASE\r