diff options
| author | Bo Yan <byan@nvidia.com> | 2011-08-25 17:02:35 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-26 15:21:33 -0700 |
| commit | 965ba30ac0538fdacb1c89ebba8c1fe14c17b976 (patch) | |
| tree | 565b908c00889ef46bd5355a6e2060b899853801 | |
| parent | 42172b0c0f3a53ef645c08223479422256ef25a4 (diff) | |
rtc: tps6591x: Clear interrupt when probing device
Make sure alarm interrupt is cleared during device probing.
bug 867362
Change-Id: Iad33c0e0715de2ec68291a57c2a55d1ad1198565
Reviewed-on: http://git-master/r/49302
Reviewed-by: Bo Yan <byan@nvidia.com>
Tested-by: Bo Yan <byan@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
| -rw-r--r-- | drivers/rtc/rtc-tps6591x.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/rtc/rtc-tps6591x.c b/drivers/rtc/rtc-tps6591x.c index 9ca5c54349dd..a187f6202bf8 100644 --- a/drivers/rtc/rtc-tps6591x.c +++ b/drivers/rtc/rtc-tps6591x.c @@ -459,13 +459,6 @@ static int __devinit tps6591x_rtc_probe(struct platform_device *pdev) return -EBUSY; } - reg = ENABLE_ALARM_INT; - tps6591x_write_regs(&pdev->dev, RTC_INT, 1, ®); - if (err) { - dev_err(&pdev->dev, "unable to program Interrupt Mask reg\n"); - return -EBUSY; - } - tps6591x_rtc_read_time(&pdev->dev, &tm); if ((tm.tm_year < RTC_YEAR_OFFSET || tm.tm_year > (RTC_YEAR_OFFSET + 99))){ if (pdata->time.tm_year < 2000 || pdata->time.tm_year > 2100) { @@ -477,6 +470,20 @@ static int __devinit tps6591x_rtc_probe(struct platform_device *pdev) tps6591x_rtc_set_time(&pdev->dev, &pdata->time); } + reg = ALARM_INT_STATUS; + err = tps6591x_write_regs(&pdev->dev, RTC_STATUS, 1, ®); + if (err) { + dev_err(&pdev->dev, "unable to program RTC_STATUS reg\n"); + return -EBUSY; + } + + reg = ENABLE_ALARM_INT; + tps6591x_write_regs(&pdev->dev, RTC_INT, 1, ®); + if (err) { + dev_err(&pdev->dev, "unable to program Interrupt Mask reg\n"); + return -EBUSY; + } + dev_set_drvdata(&pdev->dev, rtc); if (pdata && (pdata->irq >= 0)) { rtc->irq = pdata->irq; |