Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 614c27251196b7567fdb6e98a8b1fe2905367c0c

Authored by Soren Brinkmann
Committed by Michal Simek
1 parent 6c3e61de3c
Exists in master and in 49 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

zynq: timer: Migrate to zynq clock framework 

Remove hardcoded frequencies in favor of Zynq clock framework.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Showing 1 changed file with 7 additions and 4 deletions Side-by-side Diff

arch/arm/cpu/armv7/zynq/timer.c
Diff comments   View file @ 614c272
... ... @@ -29,6 +29,7 @@
29 29 #include <div64.h>
30 30 #include <asm/io.h>
31 31 #include <asm/arch/hardware.h>
  32 +#include <asm/arch/clk.h>
32 33  
33 34 DECLARE_GLOBAL_DATA_PTR;
34 35  
... ... @@ -48,7 +49,6 @@
48 49  
49 50 #define TIMER_LOAD_VAL 0xFFFFFFFF
50 51 #define TIMER_PRESCALE 255
51   -#define TIMER_TICK_HZ (CONFIG_CPU_FREQ_HZ / 2 / TIMER_PRESCALE)
52 52  
53 53 int timer_init(void)
54 54 {
... ... @@ -56,6 +56,8 @@
56 56 (TIMER_PRESCALE << SCUTIMER_CONTROL_PRESCALER_SHIFT) |
57 57 SCUTIMER_CONTROL_ENABLE_MASK;
58 58  
  59 + gd->arch.timer_rate_hz = (gd->cpu_clk / 2) / TIMER_PRESCALE;
  60 +
59 61 /* Load the timer counter register */
60 62 writel(0xFFFFFFFF, &timer_base->load);
61 63  
... ... @@ -69,7 +71,7 @@
69 71  
70 72 /* Reset time */
71 73 gd->arch.lastinc = readl(&timer_base->counter) /
72   - (TIMER_TICK_HZ / CONFIG_SYS_HZ);
  74 + (gd->arch.timer_rate_hz / CONFIG_SYS_HZ);
73 75 gd->arch.tbl = 0;
74 76  
75 77 return 0;
... ... @@ -83,7 +85,8 @@
83 85 {
84 86 ulong now;
85 87  
86   - now = readl(&timer_base->counter) / (TIMER_TICK_HZ / CONFIG_SYS_HZ);
  88 + now = readl(&timer_base->counter) /
  89 + (gd->arch.timer_rate_hz / CONFIG_SYS_HZ);
87 90  
88 91 if (gd->arch.lastinc >= now) {
89 92 /* Normal mode */
... ... @@ -107,7 +110,7 @@
107 110 if (usec == 0)
108 111 return;
109 112  
110   - countticks = lldiv(TIMER_TICK_HZ * usec, 1000000);
  113 + countticks = lldiv(gd->arch.timer_rate_hz * usec, 1000000);
111 114  
112 115 /* decrementing timer */
113 116 timeend = readl(&timer_base->counter) - countticks;