diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-03 17:02:35 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-03 17:02:35 +0100 |
| commit | ecde8243a8351725ff598f42c88ded154f8a0f1e (patch) | |
| tree | 62b6c69684c7270eb8fdd3ef4666a5f9c4fb8b8f /drivers | |
| parent | 4f47f2f1c8c46ac87c4e0a5708f950fdb59a2a17 (diff) | |
| parent | bcb324d68f7955c1136dafc944eb55db8ebaa601 (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/m41t11.c | 14 | ||||
| -rw-r--r-- | drivers/rtc/mc13783-rtc.c | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/drivers/rtc/m41t11.c b/drivers/rtc/m41t11.c index e0c27e185..bb134875b 100644 --- a/drivers/rtc/m41t11.c +++ b/drivers/rtc/m41t11.c @@ -181,18 +181,4 @@ void rtc_reset (void) val = val & 0x3F;/*turn off freq test keep calibration*/ i2c_write(CONFIG_SYS_I2C_RTC_ADDR, RTC_CONTROL_ADDR, 1, &val, 1); } - -int rtc_store(int addr, unsigned char* data, int size) -{ - /*don't let things wrap onto the time on a write*/ - if( (addr+size) >= M41T11_STORAGE_SZ ) - return 1; - return i2c_write( CONFIG_SYS_I2C_RTC_ADDR, REG_CNT+addr, 1, data, size ); -} - -int rtc_recall(int addr, unsigned char* data, int size) -{ - return i2c_read( CONFIG_SYS_I2C_RTC_ADDR, REG_CNT+addr, 1, data, size ); -} - #endif diff --git a/drivers/rtc/mc13783-rtc.c b/drivers/rtc/mc13783-rtc.c index 05db2f1d4..416f50d01 100644 --- a/drivers/rtc/mc13783-rtc.c +++ b/drivers/rtc/mc13783-rtc.c @@ -109,7 +109,7 @@ int rtc_set(struct rtc_time *rtc) spi_release_bus(slave); - return -1; + return 0; } void rtc_reset(void) |