diff options
| author | venu byravarasu <vbyravarasu@nvidia.com> | 2011-08-26 11:29:06 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-29 17:25:30 -0700 |
| commit | a4a6a3d58d59a8409a7059c50f038d716cacfc09 (patch) | |
| tree | cff575e50dee4ce74ddd3dcf39a8b5b6aefc94df | |
| parent | d33547fd42d9be21c1087446fd3dc0436b6301e8 (diff) | |
rtc: tps80031: Clearing Alarm interrupt status
Sometimes it is observed that the POR value of RTC
interrupt register is having Alarm set.
Hence clearing it before enabling RTC interrupt.
bug 867362
Change-Id: Id84db407880d4c1f5fb3023218c2b21e82cf515d
Reviewed-on: http://git-master/r/49372
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Tested-by: Bitan Biswas <bbiswas@nvidia.com>
Tested-by: Venu Byravarasu <vbyravarasu@nvidia.com>
| -rw-r--r-- | drivers/rtc/rtc-tps80031.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-tps80031.c b/drivers/rtc/rtc-tps80031.c index 840ec3d60393..d4f1d74679f9 100644 --- a/drivers/rtc/rtc-tps80031.c +++ b/drivers/rtc/rtc-tps80031.c @@ -306,7 +306,8 @@ static irqreturn_t tps80031_rtc_irq(int irq, void *data) return -EBUSY; } - err = tps80031_set_bits(dev->parent, 1, RTC_STATUS, ALARM_INT_STATUS); + err = tps80031_force_update(dev->parent, 1, RTC_STATUS, + ALARM_INT_STATUS, ALARM_INT_STATUS); if (err) { dev_err(dev->parent, "unable to set Alarm INT\n"); return -EBUSY; @@ -359,13 +360,6 @@ static int __devinit tps80031_rtc_probe(struct platform_device *pdev) goto fail; } - err = tps80031_set_bits(pdev->dev.parent, 1, RTC_INT, ENABLE_ALARM_INT); - if (err) { - dev_err(&pdev->dev, "unable to program Interrupt Mask reg\n"); - err = -EBUSY; - goto fail; - } - /* If RTC have POR values, set time using platform data*/ tps80031_rtc_read_time(&pdev->dev, &tm); if ((tm.tm_year == RTC_YEAR_OFFSET + RTC_POR_YEAR) && @@ -381,6 +375,20 @@ static int __devinit tps80031_rtc_probe(struct platform_device *pdev) tps80031_rtc_set_time(&pdev->dev, &pdata->time); } + reg = ALARM_INT_STATUS; + err = tps80031_write_regs(&pdev->dev, RTC_STATUS, 1, ®); + if (err) { + dev_err(&pdev->dev, "unable to program RTC_STATUS reg\n"); + return -EBUSY; + } + + err = tps80031_set_bits(pdev->dev.parent, 1, RTC_INT, ENABLE_ALARM_INT); + if (err) { + dev_err(&pdev->dev, "unable to program Interrupt Mask reg\n"); + err = -EBUSY; + goto fail; + } + dev_set_drvdata(&pdev->dev, rtc); if (pdata && (pdata->irq >= 0)) { rtc->irq = pdata->irq; |