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/rtc-mv.c | |
parent | 0c1355e36fdc304b102851312d80a1e69c01f5a2 (diff) |
[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/rtc-mv.c')
-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 @@ | |||
12 | #include <linux/bcd.h> | 12 | #include <linux/bcd.h> |
13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
15 | #include <linux/delay.h> | ||
15 | 16 | ||
16 | 17 | ||
17 | #define RTC_TIME_REG_OFFS 0 | 18 | #define RTC_TIME_REG_OFFS 0 |
@@ -119,6 +120,16 @@ static int __init mv_rtc_probe(struct platform_device *pdev) | |||
119 | return -EINVAL; | 120 | return -EINVAL; |
120 | } | 121 | } |
121 | 122 | ||
123 | /* make sure it is actually functional */ | ||
124 | if (rtc_time == 0x01000000) { | ||
125 | ssleep(1); | ||
126 | rtc_time = readl(pdata->ioaddr + RTC_TIME_REG_OFFS); | ||
127 | if (rtc_time == 0x01000000) { | ||
128 | dev_err(&pdev->dev, "internal RTC not ticking\n"); | ||
129 | return -ENODEV; | ||
130 | } | ||
131 | } | ||
132 | |||
122 | platform_set_drvdata(pdev, pdata); | 133 | platform_set_drvdata(pdev, pdata); |
123 | pdata->rtc = rtc_device_register(pdev->name, &pdev->dev, | 134 | pdata->rtc = rtc_device_register(pdev->name, &pdev->dev, |
124 | &mv_rtc_ops, THIS_MODULE); | 135 | &mv_rtc_ops, THIS_MODULE); |