X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Frtc%2Fds12887.c;h=486105f5edb9eb6ef535ec1f1912f47159f10636;hb=2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70;hp=57a446d3051e2102b7a31391c344b6a402145b05;hpb=b73a19e1609d0f705cbab8014ca17aefe89e4c76;p=u-boot

diff --git a/drivers/rtc/ds12887.c b/drivers/rtc/ds12887.c
index 57a446d305..486105f5ed 100644
--- a/drivers/rtc/ds12887.c
+++ b/drivers/rtc/ds12887.c
@@ -28,21 +28,21 @@
 #include <config.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_DS12887) && defined(CONFIG_CMD_DATE)
+#if defined(CONFIG_CMD_DATE)
 
 #define RTC_SECONDS			0x00
 #define RTC_SECONDS_ALARM		0x01
 #define RTC_MINUTES			0x02
 #define RTC_MINUTES_ALARM		0x03
 #define RTC_HOURS			0x04
-#define RTC_HOURS_ALARM 		0x05
-#define RTC_DAY_OF_WEEK 		0x06
+#define RTC_HOURS_ALARM			0x05
+#define RTC_DAY_OF_WEEK			0x06
 #define RTC_DATE_OF_MONTH		0x07
 #define RTC_MONTH			0x08
 #define RTC_YEAR			0x09
-#define RTC_CONTROL_A 			0x0A
-#define RTC_CONTROL_B 			0x0B
-#define RTC_CONTROL_C 			0x0C
+#define RTC_CONTROL_A			0x0A
+#define RTC_CONTROL_B			0x0B
+#define RTC_CONTROL_C			0x0C
 #define RTC_CONTROL_D			0x0D
 
 #define RTC_CA_UIP			0x80
@@ -76,18 +76,6 @@ static void rtc_write (uchar reg, uchar val)
 # error Board specific rtc access functions should be supplied
 #endif
 
-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));
-}
-
-/* ------------------------------------------------------------------------- */
-
 int rtc_get (struct rtc_time *tmp)
 {
 	uchar sec, min, hour, mday, wday, mon, year;
@@ -154,7 +142,7 @@ else
 	return 0;
 }
 
-void rtc_set (struct rtc_time *tmp)
+int rtc_set (struct rtc_time *tmp)
 {
 	uchar save_ctrl_b;
 	uchar sec, min, hour, mday, wday, mon, year;
@@ -202,6 +190,8 @@ void rtc_set (struct rtc_time *tmp)
 	/* enables the RTC to update the regs */
 	save_ctrl_b &= ~RTC_CB_SET;
 	rtc_write(RTC_CONTROL_B, save_ctrl_b);
+
+	return 0;
 }
 
 void rtc_reset (void)