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

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

diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index 9f4ce2f9adf2bb58591e934275d13f2ca797a4f7..b4a149b738089124a56dd778220577c346c8096e 100644 (file)
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2007
  * Matthias Fuchs, esd gmbh, matthias.fuchs@esd-electronics.com.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -42,8 +26,8 @@
 #endif
 /*---------------------------------------------------------------------*/
 
-#ifndef CFG_I2C_RTC_ADDR
-# define CFG_I2C_RTC_ADDR      0x32
+#ifndef CONFIG_SYS_I2C_RTC_ADDR
+# define CONFIG_SYS_I2C_RTC_ADDR       0x32
 #endif
 
 /*
@@ -90,8 +74,6 @@
 #define rtc_read(reg) buf[((reg) + 1) & 0xf]
 
 static void rtc_write (uchar reg, uchar val);
-static uchar bin2bcd (unsigned int n);
-static unsigned bcd2bin (uchar c);
 
 /*
  * Get the current time from the RTC
@@ -102,7 +84,7 @@ int rtc_get (struct rtc_time *tmp)
        uchar sec, min, hour, mday, wday, mon, year, ctl2;
        uchar buf[16];
 
-       if (i2c_read(CFG_I2C_RTC_ADDR, 0, 0, buf, 16))
+       if (i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0, 0, buf, 16))
                printf("Error reading from RTC\n");
 
        sec = rtc_read(RTC_SEC_REG_ADDR);
@@ -189,7 +171,7 @@ void rtc_reset (void)
        uchar buf[16];
        uchar ctl2;
 
-       if (i2c_read(CFG_I2C_RTC_ADDR, 0,    0,   buf, 16))
+       if (i2c_read(CONFIG_SYS_I2C_RTC_ADDR, 0,    0,   buf, 16))
                printf("Error reading from RTC\n");
 
        ctl2 = rtc_read(RTC_CTL2_REG_ADDR);
@@ -221,19 +203,9 @@ static void rtc_write (uchar reg, uchar val)
        uchar buf[2];
        buf[0] = reg << 4;
        buf[1] = val;
-       if (i2c_write(CFG_I2C_RTC_ADDR, 0, 0, buf, 2) != 0)
+       if (i2c_write(CONFIG_SYS_I2C_RTC_ADDR, 0, 0, buf, 2) != 0)
                printf("Error writing to RTC\n");
 
 }
 
-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 /* CONFIG_RTC_RX8025 && CONFIG_CMD_DATE */