rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / drivers / rtc / mpc5xxx.c

diff --git a/drivers/rtc/mpc5xxx.c b/drivers/rtc/mpc5xxx.c
index a6555f5..ec0b0ef 100644 (file)
--- a/drivers/rtc/mpc5xxx.c
+++ b/drivers/rtc/mpc5xxx.c
@@ -32,7 +32,7 @@
 #include <command.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_MPC5200) && defined(CONFIG_CMD_DATE)
+#if defined(CONFIG_CMD_DATE)
 
 /*****************************************************************************
  * this structure should be defined in mpc5200.h ...
@@ -57,7 +57,7 @@ typedef struct rtc5200 {
  *****************************************************************************/
 int rtc_get (struct rtc_time *tmp)
 {
-       RTC5200 *rtc = (RTC5200 *) (CFG_MBAR+0x800);
+       RTC5200 *rtc = (RTC5200 *) (CONFIG_SYS_MBAR+0x800);
        ulong time, date, time2;
 
        /* read twice to avoid getting a funny time when the second is just changing */
@@ -88,9 +88,9 @@ int rtc_get (struct rtc_time *tmp)
 /*****************************************************************************
  * set time
  *****************************************************************************/
-void rtc_set (struct rtc_time *tmp)
+int rtc_set (struct rtc_time *tmp)
 {
-       RTC5200 *rtc = (RTC5200 *) (CFG_MBAR+0x800);
+       RTC5200 *rtc = (RTC5200 *) (CONFIG_SYS_MBAR+0x800);
        ulong time, date, year;
 
        debug ( "Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
@@ -129,6 +129,8 @@ void rtc_set (struct rtc_time *tmp)
        udelay (1000);
        rtc->tsr = time;
        udelay (1000);
+
+       return 0;
 }
 
 /*****************************************************************************