1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index d8df2e9e14ad..2d502fc85698 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -203,8 +203,7 @@ static int ds1305_get_time(struct device *dev, struct rtc_time *time)
                 time->tm_hour, time->tm_mday,
                 time->tm_mon, time->tm_year, time->tm_wday);
 
-        /* Time may not be set */
-        return rtc_valid_tm(time);
+        return 0;
 }
 
 static int ds1305_set_time(struct device *dev, struct rtc_time *time)
@@ -544,15 +543,6 @@ static int ds1305_nvram_write(void *priv, unsigned int off, void *buf,
         return spi_sync(spi, &m);
 }
 
-static struct nvmem_config ds1305_nvmem_cfg = {
-        .name = "ds1305_nvram",
-        .word_size = 1,
-        .stride = 1,
-        .size = DS1305_NVRAM_LEN,
-        .reg_read = ds1305_nvram_read,
-        .reg_write = ds1305_nvram_write,
-};
-
 /*----------------------------------------------------------------------*/
 
 /*
@@ -566,6 +556,14 @@ static int ds1305_probe(struct spi_device *spi)
         u8                              addr, value;
         struct ds1305_platform_data     *pdata = dev_get_platdata(&spi->dev);
         bool                            write_ctrl = false;
+        struct nvmem_config ds1305_nvmem_cfg = {
+                .name = "ds1305_nvram",
+                .word_size = 1,
+                .stride = 1,
+                .size = DS1305_NVRAM_LEN,
+                .reg_read = ds1305_nvram_read,
+                .reg_write = ds1305_nvram_write,
+        };
 
         /* Sanity check board setup data.  This may be hooked up
          * in 3wire mode, but we don't care.  Note that unless
@@ -703,15 +701,15 @@ static int ds1305_probe(struct spi_device *spi)
         ds1305->rtc->ops = &ds1305_ops;
 
         ds1305_nvmem_cfg.priv = ds1305;
-        ds1305->rtc->nvmem_config = &ds1305_nvmem_cfg;
         ds1305->rtc->nvram_old_abi = true;
-
         status = rtc_register_device(ds1305->rtc);
         if (status) {
                 dev_dbg(&spi->dev, "register rtc --> %d\n", status);
                 return status;
         }
 
+        rtc_nvmem_register(ds1305->rtc, &ds1305_nvmem_cfg);
+
         /* Maybe set up alarm IRQ; be ready to handle it triggering right
          * away.  NOTE that we don't share this.  The signal is active low,
          * and we can't ack it before a SPI message delay.  We temporarily