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

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

diff --git a/drivers/rtc/mc13783-rtc.c b/drivers/rtc/mc13783-rtc.c
index 05db2f1d474ed9d6497a0f04dc15eb5316f31e32..4e18f80e93b175a9449d34eade1b1e25eea9eddd 100644 (file)
--- a/drivers/rtc/mc13783-rtc.c
+++ b/drivers/rtc/mc13783-rtc.c
@@ -23,53 +23,30 @@
 #include <common.h>
 #include <rtc.h>
 #include <spi.h>
-
-static struct spi_slave *slave;
+#include <fsl_pmic.h>
 
 int rtc_get(struct rtc_time *rtc)
 {
        u32 day1, day2, time;
-       u32 reg;
-       int err, tim, i = 0;
-
-       if (!slave) {
-               /* FIXME: Verify the max SCK rate */
-               slave = spi_setup_slave(CONFIG_MC13783_SPI_BUS,
-                               CONFIG_MC13783_SPI_CS, 1000000,
-                               SPI_MODE_2 | SPI_CS_HIGH);
-               if (!slave)
-                       return -1;
-       }
-
-       if (spi_claim_bus(slave))
-               return -1;
+       int tim, i = 0;
 
        do {
-               reg = 0x2c000000;
-               err = spi_xfer(slave, 32, (uchar *)&reg, (uchar *)&day1,
-                               SPI_XFER_BEGIN | SPI_XFER_END);
-
-               if (err)
-                       return err;
-
-               reg = 0x28000000;
-               err = spi_xfer(slave, 32, (uchar *)&reg, (uchar *)&time,
-                               SPI_XFER_BEGIN | SPI_XFER_END);
+               day1 = pmic_reg_read(REG_RTC_DAY);
+               if (day1 < 0)
+                       return -1;
 
-               if (err)
-                       return err;
+               time = pmic_reg_read(REG_RTC_TIME);
+               if (time < 0)
+                       return -1;
 
-               reg = 0x2c000000;
-               err = spi_xfer(slave, 32, (uchar *)&reg, (uchar *)&day2,
-                               SPI_XFER_BEGIN | SPI_XFER_END);
+               day2 = pmic_reg_read(REG_RTC_DAY);
+               if (day2 < 0)
+                       return -1;
 
-               if (err)
-                       return err;
        } while (day1 != day2 && i++ < 3);
 
-       spi_release_bus(slave);
-
        tim = day1 * 86400 + time;
+
        to_tm(tim, rtc);
 
        rtc->tm_yday = 0;
@@ -80,36 +57,17 @@ int rtc_get(struct rtc_time *rtc)
 
 int rtc_set(struct rtc_time *rtc)
 {
-       u32 time, day, reg;
-
-       if (!slave) {
-               /* FIXME: Verify the max SCK rate */
-               slave = spi_setup_slave(CONFIG_MC13783_SPI_BUS,
-                               CONFIG_MC13783_SPI_CS, 1000000,
-                               SPI_MODE_2 | SPI_CS_HIGH);
-               if (!slave)
-                       return -1;
-       }
+       u32 time, day;
 
        time = mktime(rtc->tm_year, rtc->tm_mon, rtc->tm_mday,
                      rtc->tm_hour, rtc->tm_min, rtc->tm_sec);
        day = time / 86400;
        time %= 86400;
 
-       if (spi_claim_bus(slave))
-               return -1;
+       pmic_reg_write(REG_RTC_DAY, day);
+       pmic_reg_write(REG_RTC_TIME, time);
 
-       reg = 0x2c000000 | day | 0x80000000;
-       spi_xfer(slave, 32, (uchar *)&reg, (uchar *)&day,
-                       SPI_XFER_BEGIN | SPI_XFER_END);
-
-       reg = 0x28000000 | time | 0x80000000;
-       spi_xfer(slave, 32, (uchar *)&reg, (uchar *)&time,
-                       SPI_XFER_BEGIN | SPI_XFER_END);
-
-       spi_release_bus(slave);
-
-       return -1;
+       return 0;
 }
 
 void rtc_reset(void)