GENERIC_TIMER_CLK and CONFIG_TIMER_CLK_FREQ are both used to define Generic Timer frequency. It is reduplicate. This patch will remove GENERIC_TIMER_CLK macro.

Signed-off-by: Alison Wang alison.wang@nxp.com --- arch/arm/cpu/armv7/ls102xa/psci.S | 2 +- arch/arm/cpu/armv7/ls102xa/timer.c | 2 +- include/configs/ls1021aqds.h | 5 ----- include/configs/ls1021atwr.h | 5 ----- 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/arch/arm/cpu/armv7/ls102xa/psci.S b/arch/arm/cpu/armv7/ls102xa/psci.S index 8f38680..9efb6d8 100644 --- a/arch/arm/cpu/armv7/ls102xa/psci.S +++ b/arch/arm/cpu/armv7/ls102xa/psci.S @@ -36,7 +36,7 @@

.align 5

-#define ONE_MS (GENERIC_TIMER_CLK / 1000) +#define ONE_MS (CONFIG_TIMER_CLK_FREQ / 1000) #define RESET_WAIT (30 * ONE_MS)

.globl psci_version diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c index e6a32ca..c926877 100644 --- a/arch/arm/cpu/armv7/ls102xa/timer.c +++ b/arch/arm/cpu/armv7/ls102xa/timer.c @@ -62,7 +62,7 @@ int timer_init(void) /* Enable System Counter */ writel(SYS_COUNTER_CTRL_ENABLE, &sctr->cntcr);

- freq = GENERIC_TIMER_CLK; + freq = CONFIG_TIMER_CLK_FREQ; asm("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));

/* Set PL1 Physical Timer Ctrl */ diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 554c13c..374c705 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -34,11 +34,6 @@ #define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE

-/* - * Generic Timer Definitions - */ -#define GENERIC_TIMER_CLK 12500000 - #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); unsigned long get_board_ddr_clk(void); diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index e5ac50e..af9d08b 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -63,11 +63,6 @@ #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #endif

-/* - * Generic Timer Definitions - */ -#define GENERIC_TIMER_CLK 12500000 - #define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_DDR_CLK_FREQ 100000000