3 files changed, 91 insertions, 4 deletions

diff --git a/firmware/drivers/rtc/rtc_d2.c b/firmware/drivers/rtc/rtc_d2.c
new file mode 100644
index 0000000000..8f60bc20df
--- /dev/null
+++ b/firmware/drivers/rtc/rtc_d2.c
@@ -0,0 +1,87 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Rob Purchase
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "rtc.h"
+#include "system.h"
+#include "pcf50606.h"
+#include "pcf50635.h"
+#include "power-target.h"
+
+void rtc_init(void)
+{
+}
+
+int rtc_read_datetime(struct tm *tm)
+{
+    unsigned int i;
+    int rc, oldlevel;
+    unsigned char buf[7];
+
+    oldlevel = disable_irq_save();
+
+    if (get_pmu_type() == PCF50606)
+        rc = pcf50606_read_multiple(0x0a, buf, sizeof(buf));
+    else
+        rc = pcf50635_read_multiple(0x59, buf, sizeof(buf));
+
+    restore_irq(oldlevel);
+
+    for (i = 0; i < sizeof(buf); i++)
+        buf[i] = BCD2DEC(buf[i]);
+
+    tm->tm_sec = buf[0];
+    tm->tm_min = buf[1];
+    tm->tm_hour = buf[2];
+    tm->tm_wday = buf[3];
+    tm->tm_mday = buf[4];
+    tm->tm_mon = buf[5] - 1;
+    tm->tm_year = buf[6] + 100;
+
+    return rc;
+}
+
+int rtc_write_datetime(const struct tm *tm)
+{
+    unsigned int i;
+    int rc, oldlevel;
+    unsigned char buf[7];
+
+    buf[0] = tm->tm_sec;
+    buf[1] = tm->tm_min;
+    buf[2] = tm->tm_hour;
+    buf[3] = tm->tm_wday;
+    buf[4] = tm->tm_mday;
+    buf[5] = tm->tm_mon + 1;
+    buf[6] = tm->tm_year - 100;
+
+    for (i = 0; i < sizeof(buf); i++)
+         buf[i] = DEC2BCD(buf[i]);
+
+    oldlevel = disable_irq_save();
+
+    if (get_pmu_type() == PCF50606)
+        rc = pcf50606_write_multiple(0x0a, buf, sizeof(buf));
+    else
+        rc = pcf50635_write_multiple(0x59, buf, sizeof(buf));
+
+    restore_irq(oldlevel);
+
+    return rc;
+}
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h
index 453fa0d4c1..4341575218 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config-cowond2.h
@@ -90,8 +90,8 @@
 #define HAVE_TOUCHSCREEN
 #define HAVE_BUTTON_DATA
 
-/* define this if you have a real-time clock */
-#define CONFIG_RTC RTC_PCF50606
+/* The D2 has either a PCF50606 or PCF50635, RTC_D2 handles both */
+#define CONFIG_RTC RTC_D2
 
 /* define this if you have RTC RAM available for settings */
 //#define HAVE_RTC_RAM
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 4245a2d31c..70e2c792d0 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -261,8 +261,8 @@ Lyre prototype 1*/
 #define RTC_S5L8700  14
 #define RTC_S35390A  15
 #define RTC_JZ47XX   16 /* Ingenic Jz47XX */
-#define RTC_NANO2G   17 /* This seems to be a PCFxxxxx,
-                           but we don't know which one */
+#define RTC_NANO2G   17 /* This seems to be a PCF5063x */
+#define RTC_D2       18 /* Either PCF50606 or PCF50635 */ 
 
 /* USB On-the-go */
 #define USBOTG_M66591  6591 /* M:Robe 500 */