github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

rtc: rtc-rk-timer: Fix 64-bit counter read

Browse Source 
Following arch_counter_get_cntvct_mem() in arm_arch_timer.c

Change-Id: I0d44edcb2cfcf2eb70aceccc57e147fa43eba34d
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
This commit is contained in:
Jeffy Chen 2018-08-27 20:15:27 +08:00 committed by Tao Huang
parent 0001ceeba7
commit 30e452a1b0
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/rtc/rtc-rk-timer.c
View File

@ -105,7 +105,26 @@ static inline int rk_timer_rtc_write64(struct rk_timer_rtc *rk_timer_rtc,
static inline int rk_timer_rtc_read64(struct rk_timer_rtc *rk_timer_rtc,
u32 reg, u64 *val)
{
return regmap_bulk_read(rk_timer_rtc->regmap, reg, val, 2);
u32 val_lo, val_hi, tmp_hi;
int ret;
do {
ret = regmap_read(rk_timer_rtc->regmap, reg + 4, &val_hi);
if (ret)
return ret;
ret = regmap_read(rk_timer_rtc->regmap, reg, &val_lo);
if (ret)
return ret;
ret = regmap_read(rk_timer_rtc->regmap, reg + 4, &tmp_hi);
if (ret)
return ret;
} while (val_hi != tmp_hi);
*val = ((u64) val_hi << 32) | val_lo;
return 0;
}
static inline int rk_timer_rtc_irq_clear(struct rk_timer_rtc *rk_timer_rtc)