| From 532db570e5181abc8f4f7bfa6c77c69ec2240198 Mon Sep 17 00:00:00 2001 |
| From: Tony Prisk <linux@prisktech.co.nz> |
| Date: Fri, 4 Jan 2013 15:35:47 -0800 |
| Subject: drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield |
| |
| From: Tony Prisk <linux@prisktech.co.nz> |
| |
| commit 532db570e5181abc8f4f7bfa6c77c69ec2240198 upstream. |
| |
| Control register bitfield for 12H/24H mode is handled incorrectly. |
| Setting CR_24H actually enables 12H mode. This patch renames the define |
| and changes the initialization code to correctly set 24H mode. |
| |
| Signed-off-by: Tony Prisk <linux@prisktech.co.nz> |
| Cc: Edgar Toernig <froese@gmx.de> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/rtc/rtc-vt8500.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/rtc/rtc-vt8500.c |
| +++ b/drivers/rtc/rtc-vt8500.c |
| @@ -70,7 +70,7 @@ |
| | ALARM_SEC_BIT) |
| |
| #define VT8500_RTC_CR_ENABLE (1 << 0) /* Enable RTC */ |
| -#define VT8500_RTC_CR_24H (1 << 1) /* 24h time format */ |
| +#define VT8500_RTC_CR_12H (1 << 1) /* 12h time format */ |
| #define VT8500_RTC_CR_SM_ENABLE (1 << 2) /* Enable periodic irqs */ |
| #define VT8500_RTC_CR_SM_SEC (1 << 3) /* 0: 1Hz/60, 1: 1Hz */ |
| #define VT8500_RTC_CR_CALIB (1 << 4) /* Enable calibration */ |
| @@ -249,7 +249,7 @@ static int __devinit vt8500_rtc_probe(st |
| } |
| |
| /* Enable RTC and set it to 24-hour mode */ |
| - writel(VT8500_RTC_CR_ENABLE | VT8500_RTC_CR_24H, |
| + writel(VT8500_RTC_CR_ENABLE, |
| vt8500_rtc->regbase + VT8500_RTC_CR); |
| |
| vt8500_rtc->rtc = rtc_device_register("vt8500-rtc", &pdev->dev, |
