diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-08-26 15:29:05 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-08-26 15:29:05 +0000 |
| commit | 498d6443146f2a1576e222ce8b50fafc0c604954 (patch) | |
| tree | bf4286db07a3c5c6b4dff8302e56b2d53f5980df /drivers/rtc | |
| parent | 952671071125edd74e401656820e52b3f87db446 (diff) | |
| parent | 6576d69aac94cd8409636dfa86e0df39facdf0d2 (diff) | |
Merge tag 'v5.4.61' into 5.4-2.1.x-imx
This is the 5.4.61 stable release
Conflicts (manual resolve, upstream version taken):
- drivers/xen/swiotlb-xen.c
Port upstream commit cca58a166920a to NXP tree, manual hunk was
resolved during merge.
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-goldfish.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-goldfish.c b/drivers/rtc/rtc-goldfish.c index 1a3420ee6a4d..d5083b013fbc 100644 --- a/drivers/rtc/rtc-goldfish.c +++ b/drivers/rtc/rtc-goldfish.c @@ -73,6 +73,7 @@ static int goldfish_rtc_set_alarm(struct device *dev, rtc_alarm64 = rtc_tm_to_time64(&alrm->time) * NSEC_PER_SEC; writel((rtc_alarm64 >> 32), base + TIMER_ALARM_HIGH); writel(rtc_alarm64, base + TIMER_ALARM_LOW); + writel(1, base + TIMER_IRQ_ENABLED); } else { /* * if this function was called with enabled=0 |