diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-06-22 23:20:14 +0200 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-07-02 02:59:36 +0200 |
| commit | 07187ee13f2b4ba183d4a4832ea153dbb2e030d3 (patch) | |
| tree | 4fe700d73c43c6ded70f82bf73d73f398c81ace5 /drivers | |
| parent | drm/radeon/kms: Fix chremap setup on RV770 CE (diff) | |
| download | linux-07187ee13f2b4ba183d4a4832ea153dbb2e030d3.tar.xz linux-07187ee13f2b4ba183d4a4832ea153dbb2e030d3.zip | |
rtc: vt8500: Use define instead of hardcoded value for status bit
Fixes the vt8500 driver to use a define value for the isr
is-alarm bit.
Cc: Alexey Charkov <alchark@gmail.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-vt8500.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-vt8500.c b/drivers/rtc/rtc-vt8500.c index efd6066b5cd2..f93f412423c6 100644 --- a/drivers/rtc/rtc-vt8500.c +++ b/drivers/rtc/rtc-vt8500.c @@ -74,6 +74,8 @@ #define VT8500_RTC_CR_SM_SEC (1 << 3) /* 0: 1Hz/60, 1: 1Hz */ #define VT8500_RTC_CR_CALIB (1 << 4) /* Enable calibration */ +#define VT8500_RTC_IS_ALARM (1 << 0) /* Alarm interrupt status */ + struct vt8500_rtc { void __iomem *regbase; struct resource *res; @@ -96,7 +98,7 @@ static irqreturn_t vt8500_rtc_irq(int irq, void *dev_id) spin_unlock(&vt8500_rtc->lock); - if (isr & 1) + if (isr & VT8500_RTC_IS_ALARM) events |= RTC_AF | RTC_IRQF; rtc_update_irq(vt8500_rtc->rtc, 1, events); @@ -161,8 +163,8 @@ static int vt8500_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) alrm->time.tm_sec = bcd2bin((alarm & TIME_SEC_MASK)); alrm->enabled = (alarm & ALARM_ENABLE_MASK) ? 1 : 0; + alrm->pending = (isr & VT8500_RTC_IS_ALARM) ? 1 : 0; - alrm->pending = (isr & 1) ? 1 : 0; return rtc_valid_tm(&alrm->time); } |