From 915f8b9eae3a9f68635bfd2e17fc0c49ee01ee02 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Thu, 7 Apr 2011 12:11:31 +0800 Subject: [PATCH] rk29: move some common define to cru.h --- arch/arm/mach-rk29/include/mach/cru.h | 4 ++++ arch/arm/mach-rk29/pm.c | 3 --- arch/arm/mach-rk29/reset.c | 4 ---- 3 files changed, 4 insertions(+), 7 deletions(-) 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 #include -#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 -- 2.34.1