[PATCH u-boot 05/12] aspeed: replace CONFIG_ASPEED_TIMER_CLK with CONFIG_TIMER_CLK_FREQ

[Cédric Le Goater]

Signed-off-by: Cédric Le Goater <clg at kaod.org>
---
 arch/arm/mach-aspeed/timer.c | 6 +++---
 include/configs/ast-common.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-aspeed/timer.c b/arch/arm/mach-aspeed/timer.c
index 626f992429b6..3755238f173c 100644
--- a/arch/arm/mach-aspeed/timer.c
+++ b/arch/arm/mach-aspeed/timer.c
@@ -20,12 +20,12 @@
 
 #include <common.h>
 
-#if CONFIG_ASPEED_TIMER_CLK < CONFIG_SYS_HZ
-#error "CONFIG_ASPEED_TIMER_CLK must be as large as CONFIG_SYS_HZ"
+#if CONFIG_TIMER_CLK_FREQ < CONFIG_SYS_HZ
+#error "CONFIG_TIMER_CLK_FREQ must be as large as CONFIG_SYS_HZ"
 #endif
 
 #define TIMER_LOAD_VAL 0xffffffff
-#define CLK_PER_HZ (CONFIG_ASPEED_TIMER_CLK / CONFIG_SYS_HZ)
+#define CLK_PER_HZ (CONFIG_TIMER_CLK_FREQ / CONFIG_SYS_HZ)
 
 /* macro to read the 32 bit timer */
 #define READ_CLK (*(volatile ulong *)(AST_TIMER_BASE + 0))
diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
index a93dc61f3730..a663d76407cb 100644
--- a/include/configs/ast-common.h
+++ b/include/configs/ast-common.h
@@ -43,7 +43,7 @@
 
 #define CONFIG_SYS_MALLOC_LEN   	(0x1000 + 4*1024*1024) /* malloc() len */
 
-#define CONFIG_ASPEED_TIMER_CLK		(1*1000*1000)	/* use external clk (1M) */
+#define CONFIG_TIMER_CLK_FREQ		(1*1000*1000)	/* use external clk (1M) */
 
 /*
  * NS16550 Configuration
-- 
2.7.4