diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-03-23 20:42:29 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-03-24 09:11:39 -0400 |
| commit | 9d1d4f9eabbca276a2a618a94ed3149d5971063e (patch) | |
| tree | 9fa2287c53a1726cfae46c99c55414048ee6cd61 /drivers/rtc | |
| parent | 0c1355e36fdc304b102851312d80a1e69c01f5a2 (diff) | |
| download | blackbird-op-linux-9d1d4f9eabbca276a2a618a94ed3149d5971063e.tar.gz blackbird-op-linux-9d1d4f9eabbca276a2a618a94ed3149d5971063e.zip | |
[ARM] Kirkwood: fail the probe if internal RTC does not work
Having a RTC that doesn't maintain proper time across a reboot is one
thing. But a RTC that doesn't work at all and only causes timeouts is
another.
Tested-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-mv.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c index 45f12dcd3716..e0263d2005ee 100644 --- a/drivers/rtc/rtc-mv.c +++ b/drivers/rtc/rtc-mv.c @@ -12,6 +12,7 @@ #include <linux/bcd.h> #include <linux/io.h> #include <linux/platform_device.h> +#include <linux/delay.h> #define RTC_TIME_REG_OFFS 0 @@ -119,6 +120,16 @@ static int __init mv_rtc_probe(struct platform_device *pdev) return -EINVAL; } + /* make sure it is actually functional */ + if (rtc_time == 0x01000000) { + ssleep(1); + rtc_time = readl(pdata->ioaddr + RTC_TIME_REG_OFFS); + if (rtc_time == 0x01000000) { + dev_err(&pdev->dev, "internal RTC not ticking\n"); + return -ENODEV; + } + } + platform_set_drvdata(pdev, pdata); pdata->rtc = rtc_device_register(pdev->name, &pdev->dev, &mv_rtc_ops, THIS_MODULE); |
