input: sensors: fromdos and remove trailing whitespace
[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-rk808.c
old mode 100755 (executable)
new mode 100644 (file)
index c396f36..35c9aad
 /*
- *     Real Time Clock driver for  rk808
+ * RTC driver for Rockchip RK808
  *
- *  Author: zhangqing <zhangqing@rock-chips.com>
+ * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
  *
- *  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.
+ * Author: Chris Zhong <zyw@rock-chips.com>
+ * Author: Zhang Qing <zhangqing@rock-chips.com>
  *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
  */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/time.h>
 #include <linux/rtc.h>
-#include <linux/slab.h>
 #include <linux/bcd.h>
-#include <linux/interrupt.h>
-#include <linux/ioctl.h>
-#include <linux/completion.h>
 #include <linux/mfd/rk808.h>
-#include <linux/delay.h>
 #include <linux/platform_device.h>
-#include <linux/miscdevice.h>
-#include <linux/irqdomain.h>
-
+#include <linux/i2c.h>
 
-/* RTC Definitions */
 /* RTC_CTRL_REG bitfields */
-#define BIT_RTC_CTRL_REG_STOP_RTC_M            0x01
-#define BIT_RTC_CTRL_REG_ROUND_30S_M           0x02
-#define BIT_RTC_CTRL_REG_AUTO_COMP_M           0x04
-#define BIT_RTC_CTRL_REG_MODE_12_24_M          0x08
-#define BIT_RTC_CTRL_REG_TEST_MODE_M           0x10
-#define BIT_RTC_CTRL_REG_SET_32_COUNTER_M      0x20
-#define BIT_RTC_CTRL_REG_GET_TIME_M            0x40
-#define BIT_RTC_CTRL_REG_RTC_V_OPT_M           0x80
-
-/* RTC_STATUS_REG bitfields */
-#define BIT_RTC_STATUS_REG_RUN_M               0x02
-#define BIT_RTC_STATUS_REG_1S_EVENT_M          0x04
-#define BIT_RTC_STATUS_REG_1M_EVENT_M          0x08
-#define BIT_RTC_STATUS_REG_1H_EVENT_M          0x10
-#define BIT_RTC_STATUS_REG_1D_EVENT_M          0x20
-#define BIT_RTC_STATUS_REG_ALARM_M             0x40
-#define BIT_RTC_STATUS_REG_POWER_UP_M          0x80
-
-/* RTC_INTERRUPTS_REG bitfields */
-#define BIT_RTC_INTERRUPTS_REG_EVERY_M         0x03
-#define BIT_RTC_INTERRUPTS_REG_IT_TIMER_M      0x04
-#define BIT_RTC_INTERRUPTS_REG_IT_ALARM_M      0x08
-
-/* DEVCTRL bitfields */
-#define BIT_RTC_PWDN                           0x40
-
-/* REG_SECONDS_REG through REG_YEARS_REG is how many registers? */
-#define ALL_TIME_REGS                          7
-#define ALL_ALM_REGS                           6
+#define BIT_RTC_CTRL_REG_STOP_RTC_M            BIT(0)
 
+/* RK808 has a shadowed register for saving a "frozen" RTC time.
+ * When user setting "GET_TIME" to 1, the time will save in this shadowed
+ * register. If set "READSEL" to 1, user read rtc time register, actually
+ * get the time of that moment. If we need the real time, clr this bit.
+ */
+#define BIT_RTC_CTRL_REG_RTC_GET_TIME          BIT(6)
+#define BIT_RTC_CTRL_REG_RTC_READSEL_M         BIT(7)
+#define BIT_RTC_INTERRUPTS_REG_IT_ALARM_M      BIT(3)
+#define RTC_STATUS_MASK                0xFE
+
+#define SECONDS_REG_MSK                0x7F
+#define MINUTES_REG_MAK                0x7F
+#define HOURS_REG_MSK          0x3F
+#define DAYS_REG_MSK           0x3F
+#define MONTHS_REG_MSK         0x1F
+#define YEARS_REG_MSK          0xFF
+#define WEEKS_REG_MSK          0x7
 
-#define RTC_SET_TIME_RETRIES   5
-#define RTC_GET_TIME_RETRIES   5
+/* REG_SECONDS_REG through REG_YEARS_REG is how many registers? */
 
+#define NUM_TIME_REGS  (RK808_WEEKS_REG - RK808_SECONDS_REG + 1)
+#define NUM_ALARM_REGS (RK808_ALARM_YEARS_REG - RK808_ALARM_SECONDS_REG + 1)
 
 struct rk808_rtc {
        struct rk808 *rk808;
        struct rtc_device *rtc;
-       unsigned int alarm_enabled:1;
+       int irq;
 };
 
 /*
- * Read current time and date in RTC
+ * The Rockchip calendar used by the RK808 counts November with 31 days. We use
+ * these translation functions to convert its dates to/from the Gregorian
+ * calendar used by the rest of the world. We arbitrarily define Jan 1st, 2016
+ * as the day when both calendars were in sync, and treat all other dates
+ * relative to that.
+ * NOTE: Other system software (e.g. firmware) that reads the same hardware must
+ * implement this exact same conversion algorithm, with the same anchor date.
  */
+static time64_t nov2dec_transitions(struct rtc_time *tm)
+{
+       return (tm->tm_year + 1900) - 2016 + (tm->tm_mon + 1 > 11 ? 1 : 0);
+}
+
+static void rockchip_to_gregorian(struct rtc_time *tm)
+{
+       /* If it's Nov 31st, rtc_tm_to_time64() will count that like Dec 1st */
+       time64_t time = rtc_tm_to_time64(tm);
+       rtc_time64_to_tm(time + nov2dec_transitions(tm) * 86400, tm);
+}
+
+static void gregorian_to_rockchip(struct rtc_time *tm)
+{
+       time64_t extra_days = nov2dec_transitions(tm);
+       time64_t time = rtc_tm_to_time64(tm);
+       rtc_time64_to_tm(time - extra_days * 86400, tm);
+
+       /* Compensate if we went back over Nov 31st (will work up to 2381) */
+       if (nov2dec_transitions(tm) < extra_days) {
+               if (tm->tm_mon + 1 == 11)
+                       tm->tm_mday++;  /* This may result in 31! */
+               else
+                       rtc_time64_to_tm(time - (extra_days - 1) * 86400, tm);
+       }
+}
+
+/* Read current time and date in RTC */
 static int rk808_rtc_readtime(struct device *dev, struct rtc_time *tm)
 {
        struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev);
        struct rk808 *rk808 = rk808_rtc->rk808;
+       u8 rtc_data[NUM_TIME_REGS];
        int ret;
-       unsigned char rtc_data[ALL_TIME_REGS + 1];
-       u8 rtc_ctl;
-
-       /*Dummy read*/  
-       ret = rk808_reg_read(rk808, RK808_RTC_CTRL_REG);
-       
-       /* Has the RTC been programmed? */
-       ret = rk808_reg_read(rk808, RK808_RTC_CTRL_REG);
-       if (ret < 0) {
-               dev_err(dev, "Failed to read RTC control: %d\n", ret);
-               return ret;
-       }
-
-       rtc_ctl = ret & (~BIT_RTC_CTRL_REG_RTC_V_OPT_M);
 
-       ret = rk808_reg_write(rk808, RK808_RTC_CTRL_REG, rtc_ctl);
-       if (ret < 0) {
-               dev_err(dev, "Failed to write RTC control: %d\n", ret);
+       /* Force an update of the shadowed registers right now */
+       ret = regmap_update_bits(rk808->regmap, RK808_RTC_CTRL_REG,
+                                BIT_RTC_CTRL_REG_RTC_GET_TIME,
+                                BIT_RTC_CTRL_REG_RTC_GET_TIME);
+       if (ret) {
+               dev_err(dev, "Failed to update bits rtc_ctrl: %d\n", ret);
                return ret;
        }
 
-#if 0  
-       /* Read twice to make sure we don't read a corrupt, partially
-        * incremented, value.
+       /*
+        * After we set the GET_TIME bit, the rtc time can't be read
+        * immediately. So we should wait up to 31.25 us, about one cycle of
+        * 32khz. If we clear the GET_TIME bit here, the time of i2c transfer
+        * certainly more than 31.25us: 16 * 2.5us at 400kHz bus frequency.
         */
-       do {
-               ret = rk808_bulk_read(rk808, RK808_SECONDS_REG,
-                                      ALL_TIME_REGS, rtc_data);
-               if (ret != 0)
-                       continue;
-
-               tm->tm_sec = bcd2bin(rtc_data[0]);
-               tm->tm_min = bcd2bin(rtc_data[1]);
-               tm->tm_hour = bcd2bin(rtc_data[2]) ;
-               tm->tm_mday = bcd2bin(rtc_data[3]);
-               tm->tm_mon = bcd2bin(rtc_data[4]) - 1;
-               tm->tm_year = bcd2bin(rtc_data[5]) + 100;       
-               tm->tm_wday = bcd2bin(rtc_data[6]);
-
-               printk( "RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
-                       1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday, tm->tm_wday,
-                       tm->tm_hour, tm->tm_min, tm->tm_sec);
-               
+       ret = regmap_update_bits(rk808->regmap, RK808_RTC_CTRL_REG,
+                                BIT_RTC_CTRL_REG_RTC_GET_TIME,
+                                0);
+       if (ret) {
+               dev_err(dev, "Failed to update bits rtc_ctrl: %d\n", ret);
                return ret;
+       }
 
-       } while (++count < RTC_GET_TIME_RETRIES);
-       dev_err(dev, "Timed out reading current time\n");
-#else
-       rtc_data[0] = rk808_reg_read(rk808,0x00);
-       rtc_data[1] = rk808_reg_read(rk808,0x01);
-       rtc_data[2] = rk808_reg_read(rk808,0x02);
-       rtc_data[3] = rk808_reg_read(rk808,0x03);
-       rtc_data[4] = rk808_reg_read(rk808,0x04);
-       rtc_data[5] = rk808_reg_read(rk808,0x05);
-       rtc_data[6] = rk808_reg_read(rk808,0x06);
-       
-        tm->tm_sec = bcd2bin(rtc_data[0]);
-         tm->tm_min = bcd2bin(rtc_data[1]);
-         tm->tm_hour = bcd2bin(rtc_data[2]) ;
-         tm->tm_mday = bcd2bin(rtc_data[3]);
-         tm->tm_mon = bcd2bin(rtc_data[4]) - 1;
-         tm->tm_year = bcd2bin(rtc_data[5]) + 100;       
-         tm->tm_wday = bcd2bin(rtc_data[6]);
-
-         dev_dbg(dev, "RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
-                        1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday, tm->tm_wday,tm->tm_hour , tm->tm_min, tm->tm_sec);
+       ret = regmap_bulk_read(rk808->regmap, RK808_SECONDS_REG,
+                              rtc_data, NUM_TIME_REGS);
+       if (ret) {
+               dev_err(dev, "Failed to bulk read rtc_data: %d\n", ret);
+               return ret;
+       }
 
-#endif
-       return 0;
+       tm->tm_sec = bcd2bin(rtc_data[0] & SECONDS_REG_MSK);
+       tm->tm_min = bcd2bin(rtc_data[1] & MINUTES_REG_MAK);
+       tm->tm_hour = bcd2bin(rtc_data[2] & HOURS_REG_MSK);
+       tm->tm_mday = bcd2bin(rtc_data[3] & DAYS_REG_MSK);
+       tm->tm_mon = (bcd2bin(rtc_data[4] & MONTHS_REG_MSK)) - 1;
+       tm->tm_year = (bcd2bin(rtc_data[5] & YEARS_REG_MSK)) + 100;
+       tm->tm_wday = bcd2bin(rtc_data[6] & WEEKS_REG_MSK);
+       rockchip_to_gregorian(tm);
+       dev_dbg(dev, "RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
+               1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
+               tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec);
 
+       return ret;
 }
 
-/*
- * Set current time and date in RTC
- */
+/* Set current time and date in RTC */
 static int rk808_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
        struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev);
        struct rk808 *rk808 = rk808_rtc->rk808;
+       u8 rtc_data[NUM_TIME_REGS];
        int ret;
-       u8 rtc_ctl;     
-       unsigned char rtc_data[ALL_TIME_REGS + 1];
-       
+
+       dev_dbg(dev, "set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
+               1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
+               tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec);
+       gregorian_to_rockchip(tm);
        rtc_data[0] = bin2bcd(tm->tm_sec);
        rtc_data[1] = bin2bcd(tm->tm_min);
-       rtc_data[2] = bin2bcd(tm->tm_hour );
+       rtc_data[2] = bin2bcd(tm->tm_hour);
        rtc_data[3] = bin2bcd(tm->tm_mday);
        rtc_data[4] = bin2bcd(tm->tm_mon + 1);
        rtc_data[5] = bin2bcd(tm->tm_year - 100);
        rtc_data[6] = bin2bcd(tm->tm_wday);
 
-        dev_dbg(dev, "set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
-                        1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday, tm->tm_wday,tm->tm_hour , tm->tm_min, tm->tm_sec);
-
-       /*Dummy read*/  
-       ret = rk808_reg_read(rk808, RK808_RTC_CTRL_REG);
-       
-       /* Stop RTC while updating the TC registers */
-       ret = rk808_reg_read(rk808, RK808_RTC_CTRL_REG);
-       if (ret < 0) {
-               dev_err(dev, "Failed to read RTC control: %d\n", ret);
+       /* Stop RTC while updating the RTC registers */
+       ret = regmap_update_bits(rk808->regmap, RK808_RTC_CTRL_REG,
+                                BIT_RTC_CTRL_REG_STOP_RTC_M,
+                                BIT_RTC_CTRL_REG_STOP_RTC_M);
+       if (ret) {
+               dev_err(dev, "Failed to update RTC control: %d\n", ret);
                return ret;
        }
-       
-       rtc_ctl = ret | (BIT_RTC_CTRL_REG_STOP_RTC_M);
 
-       ret = rk808_reg_write(rk808, RK808_RTC_CTRL_REG, rtc_ctl);
-       if (ret < 0) {
-               dev_err(dev, "Failed to write RTC control: %d\n", ret);
-               return ret;
-       }
-#if 0  
-       /* update all the time registers in one shot */
-       ret = rk808_bulk_write(rk808, RK808_SECONDS_REG,
-                                      ALL_TIME_REGS, rtc_data);
-       if (ret < 0) {
-               dev_err(dev, "Failed to read RTC times: %d\n", ret);
+       ret = regmap_bulk_write(rk808->regmap, RK808_SECONDS_REG,
+                               rtc_data, NUM_TIME_REGS);
+       if (ret) {
+               dev_err(dev, "Failed to bull write rtc_data: %d\n", ret);
                return ret;
        }
-#else
-       rk808_reg_write(rk808,0x00,rtc_data[0]);
-       rk808_reg_write(rk808,0x01,rtc_data[1]);
-       rk808_reg_write(rk808,0x02,rtc_data[2]);
-       rk808_reg_write(rk808,0x03,rtc_data[3]);
-       rk808_reg_write(rk808,0x04,rtc_data[4]);
-       rk808_reg_write(rk808,0x05,rtc_data[5]);
-       rk808_reg_write(rk808,0x06,rtc_data[6]);
-
-#endif 
-       /*Dummy read*/  
-       ret = rk808_reg_read(rk808, RK808_RTC_CTRL_REG);
-       
        /* Start RTC again */
-       ret = rk808_reg_read(rk808, RK808_RTC_CTRL_REG);
-       if (ret < 0) {
-               dev_err(dev, "Failed to read RTC control: %d\n", ret);
-               return ret;
-       }
-       
-       rtc_ctl = ret &(~ BIT_RTC_CTRL_REG_STOP_RTC_M);
-
-       ret = rk808_reg_write(rk808, RK808_RTC_CTRL_REG, rtc_ctl);
-       if (ret < 0) {
-               dev_err(dev, "Failed to write RTC control: %d\n", ret);
+       ret = regmap_update_bits(rk808->regmap, RK808_RTC_CTRL_REG,
+                                BIT_RTC_CTRL_REG_STOP_RTC_M, 0);
+       if (ret) {
+               dev_err(dev, "Failed to update RTC control: %d\n", ret);
                return ret;
        }
-
        return 0;
 }
 
-/*
- * Read alarm time and date in RTC
- */
+/* Read alarm time and date in RTC */
 static int rk808_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
        struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev);
+       struct rk808 *rk808 = rk808_rtc->rk808;
+       u8 alrm_data[NUM_ALARM_REGS];
+       uint32_t int_reg;
        int ret;
-       unsigned char alrm_data[ALL_ALM_REGS + 1];
-#if 0
-       ret = rk808_bulk_read(rk808_rtc->rk808, RK808_ALARM_SECONDS_REG,
-                              ALL_ALM_REGS, alrm_data);
-       if (ret != 0) {
-               dev_err(dev, "Failed to read alarm time: %d\n", ret);
-               return ret;
-       }
-#else
-       alrm_data[0] = rk808_reg_read(rk808_rtc->rk808,0x08);
-        alrm_data[1] = rk808_reg_read(rk808_rtc->rk808,0x09);
-        alrm_data[2] = rk808_reg_read(rk808_rtc->rk808,0x0a);
-        alrm_data[3] = rk808_reg_read(rk808_rtc->rk808,0x0b);
-        alrm_data[4] = rk808_reg_read(rk808_rtc->rk808,0x0c);
-        alrm_data[5] = rk808_reg_read(rk808_rtc->rk808,0x0d);
-
-       
-#endif
-       /* some of these fields may be wildcard/"match all" */
-       alrm->time.tm_sec = bcd2bin(alrm_data[0]);
-       alrm->time.tm_min = bcd2bin(alrm_data[1]);
-       alrm->time.tm_hour = bcd2bin(alrm_data[2]);
-       alrm->time.tm_mday = bcd2bin(alrm_data[3]);
-       alrm->time.tm_mon = bcd2bin(alrm_data[4]) - 1;
-       alrm->time.tm_year = bcd2bin(alrm_data[5]) + 100;
-
-       ret = rk808_reg_read(rk808_rtc->rk808, RK808_RTC_INT_REG);
-       if (ret < 0) {
-               dev_err(dev, "Failed to read RTC control: %d\n", ret);
+
+       ret = regmap_bulk_read(rk808->regmap, RK808_ALARM_SECONDS_REG,
+                              alrm_data, NUM_ALARM_REGS);
+
+       alrm->time.tm_sec = bcd2bin(alrm_data[0] & SECONDS_REG_MSK);
+       alrm->time.tm_min = bcd2bin(alrm_data[1] & MINUTES_REG_MAK);
+       alrm->time.tm_hour = bcd2bin(alrm_data[2] & HOURS_REG_MSK);
+       alrm->time.tm_mday = bcd2bin(alrm_data[3] & DAYS_REG_MSK);
+       alrm->time.tm_mon = (bcd2bin(alrm_data[4] & MONTHS_REG_MSK)) - 1;
+       alrm->time.tm_year = (bcd2bin(alrm_data[5] & YEARS_REG_MSK)) + 100;
+       rockchip_to_gregorian(&alrm->time);
+
+       ret = regmap_read(rk808->regmap, RK808_RTC_INT_REG, &int_reg);
+       if (ret) {
+               dev_err(dev, "Failed to read RTC INT REG: %d\n", ret);
                return ret;
        }
-       dev_dbg(dev,"alrm read RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
-                        1900 + alrm->time.tm_year, alrm->time.tm_mon + 1, alrm->time.tm_mday, alrm->time.tm_wday, alrm->time.tm_hour, alrm->time.tm_min, alrm->time.tm_sec);
-
 
+       dev_dbg(dev, "alrm read RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
+               1900 + alrm->time.tm_year, alrm->time.tm_mon + 1,
+               alrm->time.tm_mday, alrm->time.tm_wday, alrm->time.tm_hour,
+               alrm->time.tm_min, alrm->time.tm_sec);
 
-       if (ret & BIT_RTC_INTERRUPTS_REG_IT_ALARM_M)
-               alrm->enabled = 1;
-       else
-               alrm->enabled = 0;
+       alrm->enabled = (int_reg & BIT_RTC_INTERRUPTS_REG_IT_ALARM_M) ? 1 : 0;
 
        return 0;
 }
 
 static int rk808_rtc_stop_alarm(struct rk808_rtc *rk808_rtc)
 {
-       rk808_rtc->alarm_enabled = 0;
+       struct rk808 *rk808 = rk808_rtc->rk808;
+       int ret;
 
-       return rk808_clear_bits(rk808_rtc->rk808, RK808_RTC_INT_REG,
-                              BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
+       ret = regmap_update_bits(rk808->regmap, RK808_RTC_INT_REG,
+                                BIT_RTC_INTERRUPTS_REG_IT_ALARM_M, 0);
 
+       return ret;
 }
 
 static int rk808_rtc_start_alarm(struct rk808_rtc *rk808_rtc)
 {
-       rk808_rtc->alarm_enabled = 1;
+       struct rk808 *rk808 = rk808_rtc->rk808;
+       int ret;
 
-       return rk808_set_bits(rk808_rtc->rk808, RK808_RTC_INT_REG,
-                              BIT_RTC_INTERRUPTS_REG_IT_ALARM_M,BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
+       ret = regmap_update_bits(rk808->regmap, RK808_RTC_INT_REG,
+                                BIT_RTC_INTERRUPTS_REG_IT_ALARM_M,
+                                BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
 
+       return ret;
 }
 
 static int rk808_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
        struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev);
+       struct rk808 *rk808 = rk808_rtc->rk808;
+       u8 alrm_data[NUM_ALARM_REGS];
        int ret;
-       unsigned char alrm_data[ALL_TIME_REGS + 1];
-       
+
        ret = rk808_rtc_stop_alarm(rk808_rtc);
-       if (ret < 0) {
+       if (ret) {
                dev_err(dev, "Failed to stop alarm: %d\n", ret);
                return ret;
        }
+       dev_dbg(dev, "alrm set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
+               1900 + alrm->time.tm_year, alrm->time.tm_mon + 1,
+               alrm->time.tm_mday, alrm->time.tm_wday, alrm->time.tm_hour,
+               alrm->time.tm_min, alrm->time.tm_sec);
 
-        dev_dbg(dev,"alrm set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
-                        1900 + alrm->time.tm_year, alrm->time.tm_mon + 1, alrm->time.tm_mday, alrm->time.tm_wday, alrm->time.tm_hour, alrm->time.tm_min, alrm->time.tm_sec);
-
+       gregorian_to_rockchip(&alrm->time);
        alrm_data[0] = bin2bcd(alrm->time.tm_sec);
        alrm_data[1] = bin2bcd(alrm->time.tm_min);
-       alrm_data[2] = bin2bcd(alrm->time.tm_hour );
+       alrm_data[2] = bin2bcd(alrm->time.tm_hour);
        alrm_data[3] = bin2bcd(alrm->time.tm_mday);
        alrm_data[4] = bin2bcd(alrm->time.tm_mon + 1);
        alrm_data[5] = bin2bcd(alrm->time.tm_year - 100);
-#if 0
-       ret = rk808_bulk_write(rk808_rtc->rk808, RK808_ALARM_SECONDS_REG,
-                              ALL_ALM_REGS, alrm_data);
-       if (ret != 0) {
-               dev_err(dev, "Failed to read alarm time: %d\n", ret);
+
+       ret = regmap_bulk_write(rk808->regmap, RK808_ALARM_SECONDS_REG,
+                               alrm_data, NUM_ALARM_REGS);
+       if (ret) {
+               dev_err(dev, "Failed to bulk write: %d\n", ret);
                return ret;
        }
-#else
-        rk808_reg_write(rk808_rtc->rk808,0x08,alrm_data[0]);
-        rk808_reg_write(rk808_rtc->rk808,0x09,alrm_data[1]);
-        rk808_reg_write(rk808_rtc->rk808,0x0a,alrm_data[2]);
-        rk808_reg_write(rk808_rtc->rk808,0x0b,alrm_data[3]);
-        rk808_reg_write(rk808_rtc->rk808,0x0c,alrm_data[4]);
-        rk808_reg_write(rk808_rtc->rk808,0x0d,alrm_data[5]);
-
-#endif
        if (alrm->enabled) {
                ret = rk808_rtc_start_alarm(rk808_rtc);
-               if (ret < 0) {
+               if (ret) {
                        dev_err(dev, "Failed to start alarm: %d\n", ret);
                        return ret;
                }
        }
-
        return 0;
 }
 
 static int rk808_rtc_alarm_irq_enable(struct device *dev,
-                                      unsigned int enabled)
+                                     unsigned int enabled)
 {
        struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev);
 
        if (enabled)
                return rk808_rtc_start_alarm(rk808_rtc);
-       else
-               return rk808_rtc_stop_alarm(rk808_rtc);
-}
-
-static int rk808_rtc_update_irq_enable(struct device *dev,
-                                      unsigned int enabled)
-{
-       struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev);
 
-       if (enabled)
-               return rk808_set_bits(rk808_rtc->rk808, RK808_RTC_INT_REG,
-                              BIT_RTC_INTERRUPTS_REG_IT_TIMER_M,BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
-       else
-               return rk808_clear_bits(rk808_rtc->rk808, RK808_RTC_INT_REG,
-                              BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
+       return rk808_rtc_stop_alarm(rk808_rtc);
 }
 
 /*
@@ -378,102 +311,44 @@ static int rk808_rtc_update_irq_enable(struct device *dev,
  * bit 2: every hour
  * bit 3: every day
  */
-#if 0
-static int rk808_rtc_irq_set_freq(struct device *dev, int freq)
-{      
-       struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev);
-       int ret;        
-       u8 rtc_ctl;     
-       
-       if (freq < 0 || freq > 3)
-               return -EINVAL;
-
-       ret = rk808_reg_read(rk808_rtc->rk808, RK808_RTC_INT_REG);
-       if (ret < 0) {
-               dev_err(dev, "Failed to read RTC interrupt: %d\n", ret);
-               return ret;
-       }
-       
-       rtc_ctl = ret | freq;
-       
-       ret = rk808_reg_write(rk808_rtc->rk808, RK808_RTC_INT_REG, rtc_ctl);
-       if (ret < 0) {
-               dev_err(dev, "Failed to write RTC control: %d\n", ret);
-               return ret;
-       }
-       
-       return ret;
-}
-#endif
-static irqreturn_t rk808_alm_irq(int irq, void *data)
+static irqreturn_t rk808_alarm_irq(int irq, void *data)
 {
        struct rk808_rtc *rk808_rtc = data;
+       struct rk808 *rk808 = rk808_rtc->rk808;
+       struct i2c_client *client = rk808->i2c;
        int ret;
-       u8 rtc_ctl;
-       
-       /*Dummy read -- mandatory for status register*/
-       ret = rk808_reg_read(rk808_rtc->rk808, RK808_RTC_STATUS_REG);
-       if (ret < 0) {
-               printk("%s:Failed to read RTC status: %d\n", __func__, ret);
-               return ret;
-       }
-               
-       ret = rk808_reg_read(rk808_rtc->rk808, RK808_RTC_STATUS_REG);
-       if (ret < 0) {
-               printk("%s:Failed to read RTC status: %d\n", __func__, ret);
-               return ret;
-       }
-       rtc_ctl = ret&0xff;
 
-       //The alarm interrupt keeps its low level, until the micro-controller write 1 in the ALARM bit of the RTC_STATUS_REG register.  
-       ret = rk808_reg_write(rk808_rtc->rk808, RK808_RTC_STATUS_REG,rtc_ctl);
-       if (ret < 0) {
-               printk("%s:Failed to read RTC status: %d\n", __func__, ret);
+       ret = regmap_write(rk808->regmap, RK808_RTC_STATUS_REG,
+                          RTC_STATUS_MASK);
+       if (ret) {
+               dev_err(&client->dev,
+                       "%s:Failed to update RTC status: %d\n", __func__, ret);
                return ret;
        }
-       
-       rtc_update_irq(rk808_rtc->rtc, 1, RTC_IRQF | RTC_AF);
-       
-       printk("%s:irq=%d,rtc_ctl=0x%x\n",__func__,irq,rtc_ctl);
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t rk808_per_irq(int irq, void *data)
-{
-       struct rk808_rtc *rk808_rtc = data;
-       
-       rtc_update_irq(rk808_rtc->rtc, 1, RTC_IRQF | RTC_UF);
 
-       //printk("%s:irq=%d\n",__func__,irq);
+       rtc_update_irq(rk808_rtc->rtc, 1, RTC_IRQF | RTC_AF);
+       dev_dbg(&client->dev,
+                "%s:irq=%d\n", __func__, irq);
        return IRQ_HANDLED;
 }
 
 static const struct rtc_class_ops rk808_rtc_ops = {
        .read_time = rk808_rtc_readtime,
-       //.set_mmss = rk808_rtc_set_mmss,
        .set_time = rk808_rtc_set_time,
        .read_alarm = rk808_rtc_readalarm,
        .set_alarm = rk808_rtc_setalarm,
        .alarm_irq_enable = rk808_rtc_alarm_irq_enable,
-       //.update_irq_enable = rk808_rtc_update_irq_enable,
-       //.irq_set_freq = rk808_rtc_irq_set_freq,
 };
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 /* Turn off the alarm if it should not be a wake source. */
 static int rk808_rtc_suspend(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct rk808_rtc *rk808_rtc = dev_get_drvdata(&pdev->dev);
-       int ret;
-       
-       if (rk808_rtc->alarm_enabled && device_may_wakeup(&pdev->dev))
-               ret = rk808_rtc_start_alarm(rk808_rtc);
-       else
-               ret = rk808_rtc_stop_alarm(rk808_rtc);
 
-       if (ret < 0)
-               dev_err(&pdev->dev, "Failed to update RTC alarm: %d\n", ret);
+       if (device_may_wakeup(dev))
+               enable_irq_wake(rk808_rtc->irq);
 
        return 0;
 }
@@ -485,349 +360,101 @@ static int rk808_rtc_resume(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct rk808_rtc *rk808_rtc = dev_get_drvdata(&pdev->dev);
-       int ret;
 
-       if (rk808_rtc->alarm_enabled) {
-               ret = rk808_rtc_start_alarm(rk808_rtc);
-               if (ret <0)
-                       dev_err(&pdev->dev,
-                               "Failed to restart RTC alarm: %d\n", ret);
-       }
+       if (device_may_wakeup(dev))
+               disable_irq_wake(rk808_rtc->irq);
 
        return 0;
 }
+#endif
 
-/* Unconditionally disable the alarm */
-static int rk808_rtc_freeze(struct device *dev)
-{
-       struct platform_device *pdev = to_platform_device(dev);
-       struct rk808_rtc *rk808_rtc = dev_get_drvdata(&pdev->dev);
-       int ret;
-       
-       ret = rk808_rtc_stop_alarm(rk808_rtc);
-       if (ret < 0)
-               dev_err(&pdev->dev, "Failed to stop RTC alarm: %d\n", ret);
+static SIMPLE_DEV_PM_OPS(rk808_rtc_pm_ops,
+       rk808_rtc_suspend, rk808_rtc_resume);
 
-       return 0;
-}
-#else
-#define rk808_rtc_suspend NULL
-#define rk808_rtc_resume NULL
-#define rk808_rtc_freeze NULL
-#endif
-extern struct rk808 *g_rk808;
-struct platform_device *rk808_pdev;
-struct rtc_time tm_def = {     //      2012.1.1 12:00:00 Saturday
-                       .tm_wday = 6,
-                       .tm_year = 112,
-                       .tm_mon = 0,
-                       .tm_mday = 1,
-                       .tm_hour = 12,
-                       .tm_min = 0,
-                       .tm_sec = 0,
-};
-       
 static int rk808_rtc_probe(struct platform_device *pdev)
 {
        struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent);
        struct rk808_rtc *rk808_rtc;
        struct rtc_time tm;
-       int per_irq;
-       int alm_irq;
-       int ret = 0;
-       u8 rtc_ctl;
-
-       printk("%s,line=%d\n", __func__,__LINE__);
+       int ret;
 
-       rk808_rtc = kzalloc(sizeof(*rk808_rtc), GFP_KERNEL);
+       rk808_rtc = devm_kzalloc(&pdev->dev, sizeof(*rk808_rtc), GFP_KERNEL);
        if (rk808_rtc == NULL)
                return -ENOMEM;
 
        platform_set_drvdata(pdev, rk808_rtc);
        rk808_rtc->rk808 = rk808;
-       
-       /* Take rtc out of reset */
-       /*
-       ret = rk808_reg_read(rk808, RK808_DEVCTRL);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to read RK808_DEVCTRL: %d\n", ret);
-               return ret;
-       }
-       
-       if(ret & BIT_RTC_PWDN)
-       {
-               rtc_ctl = ret & (~BIT_RTC_PWDN);
-
-               ret = rk808_reg_write(rk808, RK808_DEVCTRL, rtc_ctl);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "Failed to write RTC control: %d\n", ret);
-                       return ret;
-               }
-       }
-       */
-       /*start rtc default*/
-       ret = rk808_reg_read(rk808, RK808_RTC_CTRL_REG);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to read RTC control: %d\n", ret);
+
+       /* start rtc running by default, and use shadowed timer. */
+       ret = regmap_update_bits(rk808->regmap, RK808_RTC_CTRL_REG,
+                                BIT_RTC_CTRL_REG_STOP_RTC_M |
+                                BIT_RTC_CTRL_REG_RTC_READSEL_M,
+                                BIT_RTC_CTRL_REG_RTC_READSEL_M);
+       if (ret) {
+               dev_err(&pdev->dev,
+                       "Failed to update RTC control: %d\n", ret);
                return ret;
        }
-       rtc_ctl = ret & (~BIT_RTC_CTRL_REG_STOP_RTC_M);
 
-       ret = rk808_reg_write(rk808, RK808_RTC_CTRL_REG, rtc_ctl);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to write RTC control: %d\n", ret);
+       ret = regmap_write(rk808->regmap, RK808_RTC_STATUS_REG,
+                          RTC_STATUS_MASK);
+       if (ret) {
+               dev_err(&pdev->dev,
+                       "Failed to write RTC status: %d\n", ret);
                        return ret;
-               }
-       
-       ret = rk808_reg_read(rk808, RK808_RTC_STATUS_REG);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to read RTC status: %d\n", ret);
-               return ret;
        }
-       rk808_reg_write(rk808,RK808_RTC_STATUS_REG,0xfe);       
-       /*set init time*/
 
+       /* set init time */
        ret = rk808_rtc_readtime(&pdev->dev, &tm);
-       if (ret<0)
-       {
+       if (ret) {
                dev_err(&pdev->dev, "Failed to read RTC time\n");
                return ret;
        }
-
        ret = rtc_valid_tm(&tm);
-       if (ret) {
-       dev_err(&pdev->dev,"invalid date/time and init time\n");
-               rk808_rtc_set_time(&pdev->dev, &tm_def); // 2012-01-01 12:00:00
-//             DBG( "set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",1900 + tm_def.tm_year, tm_def.tm_mon + 1, tm_def.tm_mday, tm_def.tm_wday,tm_def.tm_hour, tm_def.tm_min, tm_def.tm_sec);
-       }
+       if (ret)
+               dev_warn(&pdev->dev, "invalid date/time\n");
 
        device_init_wakeup(&pdev->dev, 1);
 
-       rk808_rtc->rtc = rtc_device_register("rk808", &pdev->dev,
-                                             &rk808_rtc_ops, THIS_MODULE);
+       rk808_rtc->rtc = devm_rtc_device_register(&pdev->dev, "rk808-rtc",
+                                                 &rk808_rtc_ops, THIS_MODULE);
        if (IS_ERR(rk808_rtc->rtc)) {
                ret = PTR_ERR(rk808_rtc->rtc);
-               goto err;
+               return ret;
        }
-       
-       per_irq = irq_create_mapping(rk808->irq_domain, RK808_IRQ_RTC_PERIOD);
-       alm_irq = irq_create_mapping(rk808->irq_domain, RK808_IRQ_RTC_ALARM);   
-
-       /*request rtc and alarm irq of rk808*/
-       ret = devm_request_threaded_irq(rk808->dev,per_irq, NULL, rk808_per_irq,
-                                  IRQF_TRIGGER_RISING, "RTC period",
-                                  rk808_rtc);
-       if (ret != 0) {
-               dev_err(&pdev->dev, "Failed to request periodic IRQ %d: %d\n",
-                       per_irq, ret);
+
+       rk808_rtc->irq = platform_get_irq(pdev, 0);
+       if (rk808_rtc->irq < 0) {
+               if (rk808_rtc->irq != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "Wake up is not possible as irq = %d\n",
+                               rk808_rtc->irq);
+               return rk808_rtc->irq;
        }
 
-       ret = devm_request_threaded_irq(rk808->dev,alm_irq, NULL, rk808_alm_irq,
-                                  IRQF_TRIGGER_RISING, "RTC alarm",
-                                  rk808_rtc);
-       if (ret != 0) {
+       /* request alarm irq of rk808 */
+       ret = devm_request_threaded_irq(&pdev->dev, rk808_rtc->irq, NULL,
+                                       rk808_alarm_irq, 0,
+                                       "RTC alarm", rk808_rtc);
+       if (ret) {
                dev_err(&pdev->dev, "Failed to request alarm IRQ %d: %d\n",
-                       alm_irq, ret);
+                       rk808_rtc->irq, ret);
        }
 
-       //for rtc irq test
-       /*
-       rk808_set_bits(rk808_rtc->rk808, RK808_RTC_STATUS_REG,(0x1<< 6),(0x1 <<6));
-       rk808_set_bits(rk808_rtc->rk808, RK808_RTC_INT_REG,0x0c,0x0c);
-       rk808_set_bits(rk808_rtc->rk808,RK808_INT_STS_REG1,(0x3 << 5),(0x3 <<5));
-       rk808_set_bits(rk808_rtc->rk808, RK808_INT_STS_MSK_REG1,(0x3 <<5),0);
-*/
-
-//     enable_irq_wake(alm_irq); // so rk808 alarm irq can wake up system
-       rk808_pdev = pdev;
-       
-       printk("%s:ok\n",__func__);
-       
-       return 0;
-
-err:
-       kfree(rk808_rtc);
        return ret;
 }
 
-static int rk808_rtc_remove(struct platform_device *pdev)
-{
-       struct rk808_rtc *rk808_rtc = platform_get_drvdata(pdev);
-       int per_irq = rk808_rtc->rk808->irq_base + RK808_IRQ_RTC_PERIOD;
-       int alm_irq = rk808_rtc->rk808->irq_base + RK808_IRQ_RTC_ALARM;
-
-       free_irq(alm_irq, rk808_rtc);
-       free_irq(per_irq, rk808_rtc);
-       rtc_device_unregister(rk808_rtc->rtc);
-       kfree(rk808_rtc);
-
-       return 0;
-}
-
-static const struct dev_pm_ops rk808_rtc_pm_ops = {
-       .suspend = rk808_rtc_suspend,
-       .resume = rk808_rtc_resume,
-
-       .freeze = rk808_rtc_freeze,
-       .thaw = rk808_rtc_resume,
-       .restore = rk808_rtc_resume,
-
-       .poweroff = rk808_rtc_suspend,
-};
-
 static struct platform_driver rk808_rtc_driver = {
        .probe = rk808_rtc_probe,
-       .remove = rk808_rtc_remove,
        .driver = {
                .name = "rk808-rtc",
                .pm = &rk808_rtc_pm_ops,
        },
 };
 
-static ssize_t rtc_rk808_test_write(struct file *file, 
-                       const char __user *buf, size_t count, loff_t *offset)
-{
-       char nr_buf[8];
-       int nr = 0, ret;
-       struct platform_device *pdev;   
-       struct rtc_time tm;
-       struct rtc_wkalrm alrm;
-       struct rk808_rtc *rk808_rtc;
-       
-       if(count > 3)
-               return -EFAULT;
-       ret = copy_from_user(nr_buf, buf, count);
-       if(ret < 0)
-               return -EFAULT;
-
-       sscanf(nr_buf, "%d", &nr);
-       if(nr > 5 || nr < 0)
-       {
-               printk("%s:data is error\n",__func__);
-               return -EFAULT;
-       }
-
-       if(!rk808_pdev)
-               return -EFAULT;
-       else
-               pdev = rk808_pdev;
-
-       
-       rk808_rtc = dev_get_drvdata(&pdev->dev);
-       
-       //test rtc time
-       if(nr == 0)
-       {       
-               tm.tm_wday = 6;
-               tm.tm_year = 111;
-               tm.tm_mon = 0;
-               tm.tm_mday = 1;
-               tm.tm_hour = 12;
-               tm.tm_min = 0;
-               tm.tm_sec = 0;
-       
-               ret = rk808_rtc_set_time(&pdev->dev, &tm); // 2011-01-01 12:00:00
-               if (ret)
-               {
-                       dev_err(&pdev->dev, "Failed to set RTC time\n");
-                       return -EFAULT;
-               }
-
-       }
-       
-       /*set init time*/
-       ret = rk808_rtc_readtime(&pdev->dev, &tm);
-       if (ret)
-               dev_err(&pdev->dev, "Failed to read RTC time\n");
-       else
-               dev_info(&pdev->dev, "RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
-                       1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, tm.tm_wday,
-                       tm.tm_hour, tm.tm_min, tm.tm_sec);
-               
-       if(!ret)
-       printk("%s:ok\n",__func__);
-       else
-       printk("%s:error\n",__func__);
-       
-
-       //test rtc alarm
-       if(nr == 2)
-       {
-               //2000-01-01 00:00:30
-               if(tm.tm_sec < 30)
-               {
-                       alrm.time.tm_sec = tm.tm_sec+30;        
-                       alrm.time.tm_min = tm.tm_min;
-               }
-               else
-               {
-                       alrm.time.tm_sec = tm.tm_sec-30;
-                       alrm.time.tm_min = tm.tm_min+1;
-               }
-               alrm.time.tm_hour = tm.tm_hour;
-               alrm.time.tm_mday = tm.tm_mday;
-               alrm.time.tm_mon = tm.tm_mon;
-               alrm.time.tm_year = tm.tm_year;         
-               rk808_rtc_alarm_irq_enable(&pdev->dev, 1);
-               rk808_rtc_setalarm(&pdev->dev, &alrm);
-
-               dev_info(&pdev->dev, "Set alarm %4d-%02d-%02d(%d) %02d:%02d:%02d\n",
-                               1900 + alrm.time.tm_year, alrm.time.tm_mon + 1, alrm.time.tm_mday, alrm.time.tm_wday,
-                               alrm.time.tm_hour, alrm.time.tm_min, alrm.time.tm_sec);
-       }
-
-       
-       if(nr == 3)
-       {       
-               ret = rk808_reg_read(rk808_rtc->rk808, RK808_RTC_STATUS_REG);
-               if (ret < 0) {
-                       printk("%s:Failed to read RTC status: %d\n", __func__, ret);
-                       return ret;
-               }
-               printk("%s:ret=0x%x\n",__func__,ret&0xff);
-
-               ret = rk808_reg_write(rk808_rtc->rk808, RK808_RTC_STATUS_REG, ret&0xff);
-               if (ret < 0) {
-                       printk("%s:Failed to read RTC status: %d\n", __func__, ret);
-                       return ret;
-               }
-       }
-
-       if(nr == 4)
-       rk808_rtc_update_irq_enable(&pdev->dev, 1);
-
-       if(nr == 5)
-       rk808_rtc_update_irq_enable(&pdev->dev, 0);
-       
-       return count;
-}
-
-static const struct file_operations rtc_rk808_test_fops = {
-       .write = rtc_rk808_test_write,
-};
-
-static struct miscdevice rtc_rk808_test_misc = {
-       .minor = MISC_DYNAMIC_MINOR,
-       .name = "rtc_rk808_test",
-       .fops = &rtc_rk808_test_fops,
-};
-
-
-static int __init rk808_rtc_init(void)
-{
-       misc_register(&rtc_rk808_test_misc);
-       return platform_driver_register(&rk808_rtc_driver);
-}
-subsys_initcall_sync(rk808_rtc_init);
-
-static void __exit rk808_rtc_exit(void)
-{      
-        misc_deregister(&rtc_rk808_test_misc);
-       platform_driver_unregister(&rk808_rtc_driver);
-}
-module_exit(rk808_rtc_exit);
+module_platform_driver(rk808_rtc_driver);
 
 MODULE_DESCRIPTION("RTC driver for the rk808 series PMICs");
-MODULE_AUTHOR("ZHANGQING <zhanqging@rock-chips.com>");
+MODULE_AUTHOR("Chris Zhong <zyw@rock-chips.com>");
+MODULE_AUTHOR("Zhang Qing <zhangqing@rock-chips.com>");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:rk808-rtc");