diff options
-rw-r--r-- | drivers/rtc/rtc-mv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c index 7e84bb4072ad..7f50d2ef7f6e 100644 --- a/drivers/rtc/rtc-mv.c +++ b/drivers/rtc/rtc-mv.c | |||
@@ -78,7 +78,7 @@ static int mv_rtc_read_time(struct device *dev, struct rtc_time *tm) | |||
78 | 78 | ||
79 | second = rtc_time & 0x7f; | 79 | second = rtc_time & 0x7f; |
80 | minute = (rtc_time >> RTC_MINUTES_OFFS) & 0x7f; | 80 | minute = (rtc_time >> RTC_MINUTES_OFFS) & 0x7f; |
81 | hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hours mode */ | 81 | hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hour mode */ |
82 | wday = (rtc_time >> RTC_WDAY_OFFS) & 0x7; | 82 | wday = (rtc_time >> RTC_WDAY_OFFS) & 0x7; |
83 | 83 | ||
84 | day = rtc_date & 0x3f; | 84 | day = rtc_date & 0x3f; |
@@ -109,7 +109,7 @@ static int mv_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) | |||
109 | 109 | ||
110 | second = rtc_time & 0x7f; | 110 | second = rtc_time & 0x7f; |
111 | minute = (rtc_time >> RTC_MINUTES_OFFS) & 0x7f; | 111 | minute = (rtc_time >> RTC_MINUTES_OFFS) & 0x7f; |
112 | hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hours mode */ | 112 | hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hour mode */ |
113 | wday = (rtc_time >> RTC_WDAY_OFFS) & 0x7; | 113 | wday = (rtc_time >> RTC_WDAY_OFFS) & 0x7; |
114 | 114 | ||
115 | day = rtc_date & 0x3f; | 115 | day = rtc_date & 0x3f; |
@@ -240,10 +240,10 @@ static int __init mv_rtc_probe(struct platform_device *pdev) | |||
240 | if (!IS_ERR(pdata->clk)) | 240 | if (!IS_ERR(pdata->clk)) |
241 | clk_prepare_enable(pdata->clk); | 241 | clk_prepare_enable(pdata->clk); |
242 | 242 | ||
243 | /* make sure the 24 hours mode is enabled */ | 243 | /* make sure the 24 hour mode is enabled */ |
244 | rtc_time = readl(pdata->ioaddr + RTC_TIME_REG_OFFS); | 244 | rtc_time = readl(pdata->ioaddr + RTC_TIME_REG_OFFS); |
245 | if (rtc_time & RTC_HOURS_12H_MODE) { | 245 | if (rtc_time & RTC_HOURS_12H_MODE) { |
246 | dev_err(&pdev->dev, "24 Hours mode not supported.\n"); | 246 | dev_err(&pdev->dev, "12 Hour mode is enabled but not supported.\n"); |
247 | ret = -EINVAL; | 247 | ret = -EINVAL; |
248 | goto out; | 248 | goto out; |
249 | } | 249 | } |