diff options
author | Baolin Wang <baolin.wang@linaro.org> | 2018-10-18 16:52:30 +0800 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-10-25 02:35:42 +0200 |
commit | 3822d1bb0df18aa28930f19bc46e0704aea1be0f (patch) | |
tree | dab8e4b37be5c2c83d7701485def1454513bcef8 /drivers/rtc | |
parent | bf2c532b67fc077051e17de4a1304a83e5ca5b15 (diff) | |
download | linux-stable-3822d1bb0df18aa28930f19bc46e0704aea1be0f.tar.gz linux-stable-3822d1bb0df18aa28930f19bc46e0704aea1be0f.tar.bz2 linux-stable-3822d1bb0df18aa28930f19bc46e0704aea1be0f.zip |
rtc: sc27xx: Always read normal alarm when registering RTC device
When registering one RTC device, it will check to see if there is an
alarm already set in RTC hardware by reading RTC alarm, at this time
we should always read the normal alarm put in always-on region by
checking the rtc->registered flag.
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-sc27xx.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-sc27xx.c b/drivers/rtc/rtc-sc27xx.c index 72bb002c88ec..b4eb3b3c6c2c 100644 --- a/drivers/rtc/rtc-sc27xx.c +++ b/drivers/rtc/rtc-sc27xx.c @@ -415,10 +415,14 @@ static int sprd_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) u32 val; /* - * If aie_timer is enabled, we should get the normal alarm time. + * Before RTC device is registered, it will check to see if there is an + * alarm already set in RTC hardware, and we always read the normal + * alarm at this time. + * + * Or if aie_timer is enabled, we should get the normal alarm time. * Otherwise we should get auxiliary alarm time. */ - if (rtc->rtc && rtc->rtc->aie_timer.enabled == 0) + if (rtc->rtc && rtc->rtc->registered && rtc->rtc->aie_timer.enabled == 0) return sprd_rtc_read_aux_alarm(dev, alrm); ret = sprd_rtc_get_secs(rtc, SPRD_RTC_ALARM, &secs); |