Merge branch 'master' of git://git.denx.de/u-boot-arm

[people/ms/u-boot.git] / drivers / rtc / ds164x.c

diff --git a/drivers/rtc/ds164x.c b/drivers/rtc/ds164x.c
index c621a9eb83b02fd71951643832f7f59c2d5c0752..9f306d196152892a5a976e3d192260421a12461f 100644 (file)
--- a/drivers/rtc/ds164x.c
+++ b/drivers/rtc/ds164x.c
@@ -41,15 +41,13 @@
 
 static uchar    rtc_read(unsigned int addr );
 static void     rtc_write(unsigned int addr, uchar val);
-static uchar    bin2bcd(unsigned int n);
-static unsigned bcd2bin(uchar c);
 
 #define RTC_EPOCH                 2000 /* century */
 
 /*
  * DS164x registers layout
  */
-#define RTC_BASE               ( CFG_NVRAM_BASE_ADDR + CFG_NVRAM_SIZE )
+#define RTC_BASE               ( CONFIG_SYS_NVRAM_BASE_ADDR + CONFIG_SYS_NVRAM_SIZE )
 
 #define RTC_YEAR               ( RTC_BASE + 0x07 )
 #define RTC_MONTH              ( RTC_BASE + 0x06 )
@@ -119,7 +117,7 @@ int rtc_get( struct rtc_time *tmp )
        return 0;
 }
 
-void rtc_set( struct rtc_time *tmp )
+int rtc_set( struct rtc_time *tmp )
 {
        uchar reg_a;
 
@@ -145,6 +143,8 @@ void rtc_set( struct rtc_time *tmp )
 
        /* unlock clock registers after read */
        rtc_write( RTC_CONTROLA, ( reg_a  & ~RTC_CA_WRITE ));
+
+       return 0;
 }
 
 void rtc_reset (void)
@@ -189,14 +189,4 @@ static void rtc_write( unsigned int addr, uchar val )
        *(volatile unsigned char*)(addr) = val;
 }
 
-static unsigned bcd2bin (uchar n)
-{
-       return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
-}
-
-static unsigned char bin2bcd (unsigned int n)
-{
-       return (((n / 10) << 4) | (n % 10));
-}
-
 #endif