Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-imx/syscounter.c | 2 +- include/configs/mx6_common.h | 2 +- include/configs/mx7_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c index df478a232637..129efac6fa69 100644 --- 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 1e99cdc7df4d..8129be9e88ea 100644 --- 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 3a5917fed4b8..dfba95b769cc 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -15,7 +15,7 @@
/* Timer settings */ #define CFG_MXC_GPT_HCLK -#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ +#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */
/* Miscellaneous configurable options */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 179d6918cd64..b45fcaa9432c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -183,7 +183,7 @@ CFG_SAR2_REG CFG_SAR_REG CFG_SCIF_A CFG_SCSI_DEV_LIST -CONFIG_SC_TIMER_CLK +CFG_SC_TIMER_CLK CONFIG_SERIAL_BOOT CONFIG_SERVERIP CONFIG_SETUP_INITRD_TAG