diff options
| author | ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com> | 2012-04-23 07:55:42 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-04-23 10:38:09 +0200 |
| commit | ae5da0e87b83402fdb876c6081f99fc4378e422f (patch) | |
| tree | 8cbd101366d1168618f0a0aa6a813dff03eaa4ca | |
| parent | 4c99ed250cc128e15eb9fa2352f7935f6c51a833 (diff) | |
RTC: Fix to correct improper implementation of clock update irq (RTC_UIE) and enable UIE Emulation
Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
| -rw-r--r-- | arch/arm/configs/u8500_defconfig | 1 | ||||
| -rw-r--r-- | drivers/rtc/rtc-ab8500.c | 15 |
2 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 2511cad8617..99a21e67dda 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -240,6 +240,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_AB=y CONFIG_RTC_DRV_AB8500=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_DMADEVICES=y CONFIG_STE_DMA40=y CONFIG_STAGING=y diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c index 587f593c17e..156430c1d57 100644 --- a/drivers/rtc/rtc-ab8500.c +++ b/drivers/rtc/rtc-ab8500.c @@ -224,8 +224,8 @@ static int ab8500_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { int retval, i; unsigned char buf[ARRAY_SIZE(ab8500_rtc_alarm_regs)]; - unsigned long mins, secs = 0; - + unsigned long mins, secs = 0, cursec=0; + struct rtc_time curtm; if (alarm->time.tm_year < (AB8500_RTC_EPOCH - 1900)) { dev_dbg(dev, "year should be equal to or greater than %d\n", AB8500_RTC_EPOCH); @@ -235,6 +235,17 @@ static int ab8500_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) /* Get the number of seconds since 1970 */ rtc_tm_to_time(&alarm->time, &secs); + /* Check whether alarm is set less than 1min. + * Since our RTC doesn't support alarm resolution less than 1min, + * return -EINVAL, so UIE EMUL can take it up, incase of UIE_ON + */ + ab8500_rtc_read_time(dev, &curtm); /* Read current time */ + rtc_tm_to_time(&curtm, &cursec); + if ((secs - cursec) < 59) { + dev_dbg(dev, "Alarm less than 1 minute not supported\n"); + return -EINVAL; + } + /* * Convert it to the number of seconds since 01-01-2000 00:00:00, since * we only have a small counter in the RTC. |