USB: ohci-at91: make OHCI work on at91sam9g10 SoC

[u-boot] / drivers / rtc / mpc5xxx.c

diff --git a/drivers/rtc/mpc5xxx.c b/drivers/rtc/mpc5xxx.c
index 216386aba052efcd48953e71a3b25825f254baa4..6b3d5e690d1f951cbc8251236029b8aeb0fef36e 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 ...
@@ -44,7 +44,7 @@ typedef struct rtc5200 {
        volatile ulong  aier;   /* MBAR+0x80C: alarm and interrupt enable register */
        volatile ulong  ctr;    /* MBAR+0x810: current time register */
        volatile ulong  cdr;    /* MBAR+0x814: current data register */
-       volatile ulong  asir;   /* MBAR+0x818: alarm and stopwatch interupt register */
+       volatile ulong  asir;   /* MBAR+0x818: alarm and stopwatch interrupt register */
        volatile ulong  piber;  /* MBAR+0x81C: periodic interrupt and bus error register */
        volatile ulong  trdr;   /* MBAR+0x820: test register/divides register */
 } RTC5200;
@@ -55,9 +55,9 @@ typedef struct rtc5200 {
 /*****************************************************************************
  * get time
  *****************************************************************************/
-void rtc_get (struct rtc_time *tmp)
+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 */
@@ -81,14 +81,16 @@ void rtc_get (struct rtc_time *tmp)
        debug ( "Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
                tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
                tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+       return 0;
 }
 
 /*****************************************************************************
  * 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",
@@ -127,6 +129,8 @@ void rtc_set (struct rtc_time *tmp)
        udelay (1000);
        rtc->tsr = time;
        udelay (1000);
+
+       return 0;
 }
 
 /*****************************************************************************