summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-11-30 21:30:13 +0100
committerWolfgang Denk <wd@denx.de>2010-11-30 21:30:13 +0100
commit52eb2c79110151b9017a0829c4d44ee7b8e2ca04 (patch)
tree755294b3743d6badff1e8ad908b0721c29dc8fc7 /arch/arm
parent998f4caf6fd63fdaa86ab0f91a1a3ed5b9cdfb22 (diff)
parentd3b0d628b08ab999a99c4ee30eaac1406a5d7056 (diff)
downloadu-boot-imx-52eb2c79110151b9017a0829c4d44ee7b8e2ca04.zip
u-boot-imx-52eb2c79110151b9017a0829c4d44ee7b8e2ca04.tar.gz
u-boot-imx-52eb2c79110151b9017a0829c4d44ee7b8e2ca04.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/armv7/s5p-common/timer.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 0490650..651fd5d 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -65,15 +65,12 @@ int timer_init(void)
writel((PRESCALER_1 & 0xff) << 8, &timer->tcfg0);
writel((MUX_DIV_2 & 0xf) << MUX4_DIV_SHIFT, &timer->tcfg1);
- if (count_value == 0) {
- /* reset initial value */
- /* count_value = 2085937.5(HZ) (per 1 sec)*/
- count_value = get_pwm_clk() / ((PRESCALER_1 + 1) *
- (MUX_DIV_2 + 1));
-
- /* count_value / 100 = 20859.375(HZ) (per 10 msec) */
- count_value = count_value / 100;
- }
+ /* count_value = 2085937.5(HZ) (per 1 sec)*/
+ count_value = get_pwm_clk() / ((PRESCALER_1 + 1) *
+ (MUX_DIV_2 + 1));
+
+ /* count_value / 100 = 20859.375(HZ) (per 10 msec) */
+ count_value = count_value / 100;
/* set count value */
writel(count_value, &timer->tcntb4);
@@ -114,8 +111,11 @@ void set_timer(unsigned long t)
/* delay x useconds */
void __udelay(unsigned long usec)
{
+ struct s5p_timer *const timer = s5p_get_base_timer();
unsigned long tmo, tmp;
+ count_value = readl(&timer->tcntb4);
+
if (usec >= 1000) {
/*
* if "big" number, spread normalization