global: Migrate CONFIG_SC_TIMER_CLK to CFG

Perform a simple rename of CONFIG_SC_TIMER_CLK to CFG_SC_TIMER_CLK

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index df478a23263703d31ab8a2b8f940f1d4cb3c698d..129efac6fa699b2335fb9e7e9388e1524a07a106 100644 (file)
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -65,7 +65,7 @@ int timer_init(void)
        struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR;
        unsigned long val, freq;
 
-       freq = CONFIG_SC_TIMER_CLK;
+       freq = CFG_SC_TIMER_CLK;
        asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
 
        writel(freq, &sctr->cntfid0);

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index dd8cabc2e935bdb2d5af96cabecd0b7cbe2512f9..0b8233de8c42b871f81d5a2c9e94b1674818cd58 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -9,7 +9,7 @@
 #include <linux/stringify.h>
 
 #if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL))
-#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */
 #else
 #ifndef CONFIG_SYS_L2CACHE_OFF
 #define CFG_SYS_PL310_BASE     L2_PL310_BASE

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 6e14b4fbf053396bddf43d4851764959fd7c9c80..a542839ce1da7c1741b9db82d94953c92b405fe0 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -14,7 +14,7 @@
 #include <asm/mach-imx/gpio.h>
 
 /* Timer settings */
-#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
 /* Miscellaneous configurable options */