commit 62a3459d4772d5c6b5caa26f1986e0a1d8246910
author Yuri Tikhonov <yur@emcraft.com> Fri Aug 15 15:42:09 2008 +0200
committer Wolfgang Denk <wd@denx.de> Sat Sep 06 01:22:20 2008 +0200
tree 033204aa56cc684cb99e5c212d1a9b84cfefa5b8
parent c3be13bdab3cfdd17c8980fa4394ec2bbe07be77

RX 8025 RTC: analyze 12/24-hour mode flag in rtc_get().

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>

drivers/rtc/rx8025.c

diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index 064138e..fd6aec5 100644
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -136,7 +136,11 @@
 
 	tmp->tm_sec  = bcd2bin (sec & 0x7F);
 	tmp->tm_min  = bcd2bin (min & 0x7F);
-	tmp->tm_hour = bcd2bin (hour & 0x3F);
+	if (rtc_read(RTC_CTL1_REG_ADDR) & RTC_CTL1_BIT_2412)
+		tmp->tm_hour = bcd2bin (hour & 0x3F);
+	else
+		tmp->tm_hour = bcd2bin (hour & 0x1F) % 12 +
+			       ((hour & 0x20) ? 12 : 0);
 	tmp->tm_mday = bcd2bin (mday & 0x3F);
 	tmp->tm_mon  = bcd2bin (mon & 0x1F);
 	tmp->tm_year = bcd2bin (year) + ( bcd2bin (year) >= 70 ? 1900 : 2000);