diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-25 11:00:08 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-25 11:00:08 +0100 |
| commit | cf281a99b6e4f1223c8fdce390db3bf79e773f4c (patch) | |
| tree | 33bff28362b5e41f7a2a09c097e0d2ea6e4ded13 /drivers/rtc | |
| parent | Merge branch 'highmem' into devel (diff) | |
| parent | [ARM] Kirkwood: fail the probe if internal RTC does not work (diff) | |
| download | linux-cf281a99b6e4f1223c8fdce390db3bf79e773f4c.tar.xz linux-cf281a99b6e4f1223c8fdce390db3bf79e773f4c.zip | |
Merge git://git.marvell.com/orion into devel
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); |