From: Yuri Tikhonov <yur@emcraft.com>
Date: Fri, 15 Aug 2008 13:42:09 +0000 (+0200)
Subject: RX 8025 RTC: analyze 12/24-hour mode flag in rtc_get().
X-Git-Tag: v2008.10-rc1~58
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5875d358f025c1b042d8a0f08384b756de7256c9;p=oweals%2Fu-boot.git

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

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

diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index 064138e9eb..fd6aec5feb 100644
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -136,7 +136,11 @@ int rtc_get (struct rtc_time *tmp)
 
 	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);