The patch titled
Subject: drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield
has been removed from the -mm tree. Its filename was
drivers-rtc-rtc-vt8500c-correct-handling-of-cr_24h-bitfield.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Tony Prisk <[email protected]>
Subject: drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield
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 <[email protected]>
Cc: Edgar Toernig <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
drivers/rtc/rtc-vt8500.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN
drivers/rtc/rtc-vt8500.c~drivers-rtc-rtc-vt8500c-correct-handling-of-cr_24h-bitfield
drivers/rtc/rtc-vt8500.c
---
a/drivers/rtc/rtc-vt8500.c~drivers-rtc-rtc-vt8500c-correct-handling-of-cr_24h-bitfield
+++ a/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 */
@@ -247,7 +247,7 @@ static int vt8500_rtc_probe(struct platf
}
/* 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,
_
Patches currently in -mm which might be from [email protected] are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
