musb: Program extvbus for OMAP3EVM Rev >= E

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

diff --git a/drivers/rtc/max6900.c b/drivers/rtc/max6900.c
index 758d7b79d94323fa135794ab8a5682c6cc6280fd..74637d1988d3281673837d1f21ba1ec5f363908f 100644 (file)
--- a/drivers/rtc/max6900.c
+++ b/drivers/rtc/max6900.c
@@ -34,33 +34,23 @@
 
 #if defined(CONFIG_CMD_DATE)
 
-#ifndef        CFG_I2C_RTC_ADDR
-#define        CFG_I2C_RTC_ADDR        0x50
+#ifndef        CONFIG_SYS_I2C_RTC_ADDR
+#define        CONFIG_SYS_I2C_RTC_ADDR 0x50
 #endif
 
 /* ------------------------------------------------------------------------- */
 
 static uchar rtc_read (uchar reg)
 {
-       return (i2c_reg_read (CFG_I2C_RTC_ADDR, reg));
+       return (i2c_reg_read (CONFIG_SYS_I2C_RTC_ADDR, reg));
 }
 
 static void rtc_write (uchar reg, uchar val)
 {
-       i2c_reg_write (CFG_I2C_RTC_ADDR, reg, val);
+       i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
        udelay(2500);
 }
 
-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)