shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

rtc: rockchip: Add timeout judgment for update rtc status

Browse Source 
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Id5f08190b4765c155db69d6f83d5bac93db80439
This commit is contained in:
shengfei Xu
2022-12-08 08:55:50 +00:00
committed by Elaine Zhang
parent 9e8e00e171
commit 1eccda2b77
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/rtc/rtc-rockchip.c
View File

@@ -61,6 +61,7 @@
/* RTC_CTRL_REG bitfields */
#define RTC_CTRL_REG_START_RTC BIT(0)
#define RTC_TIMEOUT (3000 * 1000)
/* RK630 has a shadowed register for saving a "frozen" RTC time.
* When user setting "GET_TIME" to 1, the time will save in this shadowed
@@ -220,15 +221,14 @@ static int rockchip_rtc_set_time(struct device *dev, struct rtc_time *tm)
dev_err(dev, "Failed to update RTC control: %d\n", ret);
return ret;
}
ret = regmap_read(rtc->regmap, RTC_STATUS1, &status);
while (status & RTC_CTRL_REG_START_RTC) {
udelay(1);
ret = regmap_read(rtc->regmap, RTC_STATUS1, &status);
if (ret) {
dev_err(dev, "Failed to read RTC_STATUS1: %d\n", ret);
return ret;
}
}
ret = regmap_read_poll_timeout(rtc->regmap, RTC_STATUS1, status,
!(status & RTC_CTRL_REG_START_RTC),
0, RTC_TIMEOUT);
if (ret)
dev_err(dev,
"%s:timeout Update RTC_STATUS1 : %d\n",
__func__, ret);
ret = regmap_bulk_write(rtc->regmap, RTC_SET_SECONDS,
rtc_data, NUM_TIME_REGS);
@@ -247,15 +247,15 @@ static int rockchip_rtc_set_time(struct device *dev, struct rtc_time *tm)
dev_err(dev, "Failed to update RTC control: %d\n", ret);
return ret;
}
ret = regmap_read(rtc->regmap, RTC_STATUS1, &status);
while (!(status & RTC_CTRL_REG_START_RTC)) {
udelay(1);
ret = regmap_read(rtc->regmap, RTC_STATUS1, &status);
if (ret) {
dev_err(dev, "Failed to read RTC_STATUS1: %d\n", ret);
return ret;
}
}
ret = regmap_read_poll_timeout(rtc->regmap, RTC_STATUS1, status,
(status & RTC_CTRL_REG_START_RTC),
0, RTC_TIMEOUT);
if (ret)
dev_err(dev,
"%s:timeout Update RTC_STATUS1 : %d\n",
__func__, ret);
return 0;
}