diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2017-02-16 01:20:20 +0000 |
|---|---|---|
| committer | Jagan Teki <jagan@amarulasolutions.com> | 2017-04-05 15:03:17 +0530 |
| commit | 4d24e5f175fee197cb39027de9048a8c18fa6dba (patch) | |
| tree | c9d51d48ea033f1427584fb5f818bc4a2d618e58 /arch/arm/cpu/armv7 | |
| parent | e4916e850bfb3a148b4167974d59332b72d2d055 (diff) | |
fsl: ls102x: remove redundant GENERIC_TIMER_CLK
Some Freescale boards used an extra version of the constant to hold the
Generic Timer frequency. This can easily be covered by the now unified
COUNTER_FREQUENCY constant, so remove this extra variable from those
boards.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: York Sun <york.sun@nxp.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/ls102xa/psci.S | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/ls102xa/timer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/psci.S b/arch/arm/cpu/armv7/ls102xa/psci.S index 3d41d37a64..e1dc5f3748 100644 --- a/arch/arm/cpu/armv7/ls102xa/psci.S +++ b/arch/arm/cpu/armv7/ls102xa/psci.S @@ -37,7 +37,7 @@ .align 5 -#define ONE_MS (GENERIC_TIMER_CLK / 1000) +#define ONE_MS (COUNTER_FREQUENCY / 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 e6a32caafc..d5237d214a 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 = COUNTER_FREQUENCY; asm("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq)); /* Set PL1 Physical Timer Ctrl */ |