dm: rtc: Rename mktime() and reduce the number of parameters

[karo-tx-uboot.git] / drivers / rtc / bfin_rtc.c

diff --git a/drivers/rtc/bfin_rtc.c b/drivers/rtc/bfin_rtc.c
index 3f8c7eda60d96377270e95ab1df23c1f2245cedb..a079a1d472365c95e72e5d00f2d216d0aeb6c9f1 100644 (file)
--- a/drivers/rtc/bfin_rtc.c
+++ b/drivers/rtc/bfin_rtc.c
@@ -26,10 +26,17 @@
 #define NUM_SECS_IN_HR    HRS_TO_SECS(1)
 #define NUM_SECS_IN_DAY   DAYS_TO_SECS(1)
 
+/* Enable the RTC prescaler enable register */
+void rtc_init(void)
+{
+       if (!(bfin_read_RTC_PREN() & 0x1))
+               bfin_write_RTC_PREN(0x1);
+}
+
 /* Our on-chip RTC has no notion of "reset" */
 void rtc_reset(void)
 {
-       return;
+       rtc_init();
 }
 
 /* Wait for pending writes to complete */
@@ -42,14 +49,6 @@ static void wait_for_complete(void)
        bfin_write_RTC_ISTAT(WRITE_COMPLETE);
 }
 
-/* Enable the RTC prescaler enable register */
-int rtc_init(void)
-{
-       pr_stamp();
-       bfin_write_RTC_PREN(0x1);
-       return 0;
-}
-
 /* Set the time. Get the time_in_secs which is the number of seconds since Jan 1970 and set the RTC registers
  * based on this value.
  */
@@ -64,11 +63,11 @@ int rtc_set(struct rtc_time *tmp)
                return -1;
        }
 
+       rtc_init();
        wait_for_complete();
 
        /* Calculate number of seconds this incoming time represents */
-       remain = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday,
-                       tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+       remain = rtc_mktime(tmp);
 
        /* Figure out how many days since epoch */
        days = remain / NUM_SECS_IN_DAY;
@@ -100,6 +99,7 @@ int rtc_get(struct rtc_time *tmp)
                return -1;
        }
 
+       rtc_init();
        wait_for_complete();
 
        /* Read the RTC_STAT register */
@@ -113,7 +113,7 @@ int rtc_get(struct rtc_time *tmp)
 
        /* Calculate the total number of seconds since epoch */
        time_in_sec = (tm_sec) + MIN_TO_SECS(tm_min) + HRS_TO_SECS(tm_hr) + DAYS_TO_SECS(tm_day);
-       to_tm(time_in_sec, tmp);
+       rtc_to_tm(time_in_sec, tmp);
 
        return 0;
 }