UPSTREAM: PCI: rockchip: remove the pointer to L1 substate cap
[firefly-linux-kernel-4.4.55.git] / drivers / power / rk818_battery.c
old mode 100755 (executable)
new mode 100644 (file)
index c544efd..7933fcd
@@ -1,41 +1,45 @@
 /*
- * rk818  battery driver
+ * rk818 battery driver
  *
- * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- * */
+ * Copyright (C) 2016 Rockchip Electronics Co., Ltd
+ * chenjh <chenjh@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/param.h>
-#include <linux/jiffies.h>
-#include <linux/workqueue.h>
 #include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/gpio.h>
+#include <linux/iio/consumer.h>
+#include <linux/iio/iio.h>
+#include <linux/irq.h>
+#include <linux/irqdomain.h>
+#include <linux/jiffies.h>
+#include <linux/mfd/rk808.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
-#include <linux/idr.h>
-#include <linux/i2c.h>
-#include <linux/slab.h>
-#include <asm/unaligned.h>
-#include <linux/gpio.h>
-#include <linux/proc_fs.h>
-#include <linux/uaccess.h>
-#include <linux/power/rk818_battery.h>
-#include <linux/mfd/rk818.h>
-#include <linux/time.h>
-#include <linux/interrupt.h>
+#include <linux/power/rk_usbbc.h>
+#include <linux/regmap.h>
 #include <linux/rtc.h>
+#include <linux/timer.h>
 #include <linux/wakelock.h>
-#include <linux/of_gpio.h>
-#include <linux/irq.h>
-#include <linux/irqdomain.h>
-
-/* if you  want to disable, don't set it as 0,
-                       just be: "static int dbg_enable;" is ok*/
-static int dbg_enable;
-#define RK818_SYS_DBG 1
+#include <linux/workqueue.h>
+#include "rk818_battery.h"
 
+static int dbg_enable = 0;
 module_param_named(dbg_level, dbg_enable, int, 0644);
+
 #define DBG(args...) \
        do { \
                if (dbg_enable) { \
@@ -43,266 +47,218 @@ module_param_named(dbg_level, dbg_enable, int, 0644);
                } \
        } while (0)
 
+#define BAT_INFO(fmt, args...) pr_info("rk818-bat: "fmt, ##args)
 
+/* default param */
 #define DEFAULT_BAT_RES                        135
-#define DEFAULT_VLMT                   4200
-#define DEFAULT_ILMT                   2000
-#define DEFAULT_ICUR                   1600
-
-#define DEF_TEST_ILMT_MA               2000
-#define DEF_TEST_CURRENT_MA            1800
-
-#define DSOC_DISCHRG_FAST_DEC_SEC      120     /*seconds*/
-#define DSOC_DISCHRG_FAST_EER_RANGE    25
-#define DSOC_CHRG_FAST_CALIB_CURR_MAX  400     /*mA*/
-#define DSOC_CHRG_FAST_INC_SEC         120     /*seconds*/
-#define DSOC_CHRG_FAST_EER_RANGE       15
-#define DSOC_CHRG_EMU_CURR             1200
-#define DSOC_CHG_TERM_CURR             600
-#define DSOC_CHG_TERM_VOL              4100
-#define        CHG_FINISH_VOL                  4100
-
-/*realtime RSOC calib param*/
-#define RSOC_DISCHG_ERR_LOWER  40
-#define RSOC_DISCHG_ERR_UPPER  50
-#define RSOC_ERR_CHCK_CNT      15
-#define RSOC_COMPS             20      /*compensation*/
-#define RSOC_CALIB_CURR_MAX    900     /*mA*/
-#define RSOC_CALIB_DISCHGR_TIME        3       /*min*/
-
-#define RSOC_RESUME_ERR                10
-#define REBOOT_INTER_MIN       1
-
-#define INTERPOLATE_MAX                1000
-#define MAX_INT                        0x7FFF
-#define TIME_10MIN_SEC         600
-
-#define CHG_VOL_SHIFT          4
-#define CHG_ILIM_SHIFT         0
-#define CHG_ICUR_SHIFT         0
-#define DEF_CHRG_VOL           CHRG_VOL4200
-#define DEF_CHRG_CURR_SEL      CHRG_CUR1400mA
-#define DEF_CHRG_CURR_LMT      ILIM_2000MA
-
-/*TEST_POWER_MODE params*/
-#define TEST_CURRENT           1000
-#define TEST_VOLTAGE           3800
-#define TEST_SOC               66
-#define TEST_STATUS            POWER_SUPPLY_STATUS_CHARGING
-#define TEST_PRESET            1
-#define TEST_AC_ONLINE         1
-#define TEST_USB_ONLINE                0
-
-/*
- * the following table value depends on datasheet
- */
-int CHG_V_LMT[] = {4050, 4100, 4150, 4200, 4300, 4350};
-
-int CHG_I_CUR[] = {1000, 1200, 1400, 1600, 1800, 2000,
-                  2250, 2400, 2600, 2800, 3000};
-
-int CHG_I_LMT[] = {450, 800, 850, 1000, 1250, 1500, 1750,
-                  2000, 2250, 2500, 2750, 3000};
-
-u8 CHG_CVCC_HOUR[] = {4, 5, 6, 8, 10, 12, 14, 16};
-
-#define RK818_DC_IN            0
-#define RK818_DC_OUT           1
-#define SEC_TO_MIN(x)          ((x)/60)
-#define BASE_TO_MIN(x)         ((get_seconds()-(x))/60)
-#define BASE_TO_SEC(x)         (get_seconds()-(x))
-
-#define        OCV_VALID_SHIFT         (0)
-#define        OCV_CALIB_SHIFT         (1)
-#define FIRST_PWRON_SHIFT      (2)
-
+#define DEFAULT_SLP_ENTER_CUR          300
+#define DEFAULT_SLP_EXIT_CUR           300
+#define DEFAULT_SLP_FILTER_CUR         100
+#define DEFAULT_PWROFF_VOL_THRESD      3400
+#define DEFAULT_MONITOR_SEC            5
+#define DEFAULT_ALGR_VOL_THRESD1       3850
+#define DEFAULT_ALGR_VOL_THRESD2       3950
+#define DEFAULT_MAX_SOC_OFFSET         60
+#define DEFAULT_FB_TEMP                        TEMP_105C
+#define DEFAULT_ZERO_RESERVE_DSOC      10
+#define DEFAULT_POFFSET                        42
+#define DEFAULT_COFFSET                        0x832
+#define DEFAULT_SAMPLE_RES             20
+#define DEFAULT_ENERGY_MODE            0
+#define INVALID_COFFSET_MIN            0x780
+#define INVALID_COFFSET_MAX            0x980
+#define INVALID_VOL_THRESD             2500
+
+/* sample resistor and division */
+#define SAMPLE_RES_10MR                        10
+#define SAMPLE_RES_20MR                        20
+#define SAMPLE_RES_DIV1                        1
+#define SAMPLE_RES_DIV2                        2
+
+/* virtual params */
+#define VIRTUAL_CURRENT                        1000
+#define VIRTUAL_VOLTAGE                        3888
+#define VIRTUAL_SOC                    66
+#define VIRTUAL_PRESET                 1
+#define VIRTUAL_TEMPERATURE            188
+#define VIRTUAL_STATUS                 POWER_SUPPLY_STATUS_CHARGING
+
+/* charge */
+#define FINISH_CHRG_CUR1                       1000
+#define FINISH_CHRG_CUR2               1500
+#define FINISH_MAX_SOC_DELAY           20
+#define TERM_CHRG_DSOC                 88
+#define TERM_CHRG_CURR                 600
+#define TERM_CHRG_K                    650
+#define SIMULATE_CHRG_INTV             8
+#define SIMULATE_CHRG_CURR             400
+#define SIMULATE_CHRG_K                        1500
+#define FULL_CHRG_K                    400
+
+/* zero algorithm */
+#define PWROFF_THRESD                  3400
+#define MIN_ZERO_DSOC_ACCURACY         10      /*0.01%*/
+#define MIN_ZERO_OVERCNT               100
+#define MIN_ACCURACY                   1
+#define DEF_PWRPATH_RES                        50
+#define        WAIT_DSOC_DROP_SEC              15
+#define        WAIT_SHTD_DROP_SEC              30
+#define ZERO_GAP_XSOC1                 10
+#define ZERO_GAP_XSOC2                 5
+#define ZERO_GAP_XSOC3                 3
+#define ZERO_LOAD_LVL1                 1400
+#define ZERO_LOAD_LVL2                 600
+#define ZERO_GAP_CALIB                 5
+
+#define ADC_CALIB_THRESHOLD            4
+#define ADC_CALIB_LMT_MIN              3
+#define ADC_CALIB_CNT                  5
+#define NTC_CALC_FACTOR                        7
+
+/* time */
+#define        POWER_ON_SEC_BASE               1
+#define MINUTE(x)                      ((x) * 60)
+
+/* sleep */
+#define SLP_CURR_MAX                   40
+#define SLP_CURR_MIN                   6
+#define DISCHRG_TIME_STEP1             MINUTE(10)
+#define DISCHRG_TIME_STEP2             MINUTE(60)
+#define SLP_DSOC_VOL_THRESD            3600
+#define REBOOT_PERIOD_SEC              180
+#define REBOOT_MAX_CNT                 80
+
+/* fcc */
+#define MIN_FCC                                500
+
+static const char *bat_status[] = {
+       "charge off", "dead charge", "trickle charge", "cc cv",
+       "finish", "usb over vol", "bat temp error", "timer error",
+};
 
-struct battery_info {
+struct rk818_battery {
+       struct platform_device          *pdev;
+       struct rk808                    *rk818;
+       struct regmap                   *regmap;
        struct device                   *dev;
-       struct cell_state               cell;
-       struct power_supply             bat;
-       struct power_supply             ac;
-       struct power_supply             usb;
-       struct delayed_work             work;
-       /* struct i2c_client            *client; */
-       struct rk818                    *rk818;
-       struct pinctrl                  *pinctrl;
-       struct pinctrl_state            *pins_default;
-
-
-       struct battery_platform_data    *platform_data;
-
-       int                             dc_det_pin;
-       int                             dc_det_level;
-       int                             dc_det_pullup_inside;
-       int                             work_on;
-       int                             irq;
-       int                             ac_online;
-       int                             usb_online;
-       int                             dc_online;
-       int                             status;
+       struct power_supply             *bat;
+       struct battery_platform_data    *pdata;
+       struct workqueue_struct         *bat_monitor_wq;
+       struct delayed_work             bat_delay_work;
+       struct delayed_work             calib_delay_work;
+       struct wake_lock                wake_lock;
+       struct notifier_block           fb_nb;
+       struct timer_list               caltimer;
+       struct timeval                  rtc_base;
+       int                             bat_res;
+       int                             chrg_status;
+       bool                            is_initialized;
+       bool                            is_first_power_on;
+       u8                              res_div;
        int                             current_avg;
-       int                             current_offset;
-
-       uint16_t                        voltage;
-       uint16_t                        voltage_ocv;
-       uint16_t                        relax_voltage;
-       u8                              charge_status;
-       u8                              otg_status;
-       int                             pcb_ioffset;
-       bool                            pcb_ioffset_updated;
-       unsigned long                   queue_work_cnt;
-       u32                             term_chg_cnt;
-       u32                             emu_chg_cnt;
-
-       uint16_t                        warnning_voltage;
-
-       int                             design_capacity;
+       int                             voltage_avg;
+       int                             voltage_ocv;
+       int                             voltage_relax;
+       int                             voltage_k;
+       int                             voltage_b;
+       int                             remain_cap;
+       int                             design_cap;
+       int                             nac;
        int                             fcc;
        int                             qmax;
-       int                             remain_capacity;
-       int                             nac;
-       int                             temp_nac;
-       int                             real_soc;
-       int                             display_soc;
-       int                             odd_capacity;
-       int                             temp_soc;
-
-       int                             est_ocv_vol;
-       int                             est_ocv_soc;
-       u8                              err_chck_cnt;
-       int                             err_soc_sum;
-       int                             bat_res_update_cnt;
-       int                             soc_counter;
-       int                             dod0;
-       int                             dod0_status;
-       int                             dod0_voltage;
-       int                             dod0_capacity;
-       unsigned long                   dod0_time;
-       u8                              dod0_level;
-       int                             adjust_cap;
-
-       int                             enter_flatzone;
-       int                             exit_flatzone;
-
-       int                             time2empty;
-       int                             time2full;
-
-       int                             *ocv_table;
-       int                             *res_table;
-
-       int                             current_k;/* (ICALIB0, ICALIB1) */
-       int                             current_b;
-
-       int                             voltage_k;/* VCALIB0 VCALIB1 */
-       int                             voltage_b;
-
-       int                             zero_updated;
-       int                             old_display_soc;
-       int                             zero_cycle;
-
-
-       int                             update_k;
-       int                             line_k;
-       int                             voltage_old;
-
-       int                             q_dead;
-       int                             q_err;
-       int                             q_shtd;
-
-       u8                              check_count;
-       /* u32                          status; */
-       struct timeval                  soc_timer;
-       struct timeval                  change_timer;
-
-       int                             vol_smooth_time;
-       int                             charge_smooth_time;
-       int                             sum_suspend_cap;
-       int                             suspend_cap;
-       int                             resume_capacity;
-       struct timespec                 suspend_time;
-       struct timespec                 resume_time;
-       unsigned long                   suspend_time_start;
-       unsigned long                   count_sleep_time;
-
-       int                             suspend_rsoc;
-       int                             sleep_status;
-       int                             suspend_charge_current;
-       int                             resume_soc;
-       int                             bat_res;
-       bool                            bat_res_updated;
-       bool                            charge_smooth_status;
-       bool                            resume;
-       unsigned long                   last_plugin_time;
-       bool                            sys_wakeup;
-
-       unsigned long                   charging_time;
-       unsigned long                   discharging_time;
-       unsigned long                   finish_time;
-
-       u32                             charge_min;
-       u32                             discharge_min;
-       u32                             finish_min;
-       struct notifier_block           battery_nb;
-       struct workqueue_struct         *wq;
-       struct delayed_work             battery_monitor_work;
-       struct delayed_work             charge_check_work;
-       int                             charge_otg;
-
-       struct wake_lock                resume_wake_lock;
-       unsigned long                   sys_on_base;
-       unsigned long                   chrg_time_base;
-       int                             chrg_time2_full;
-       int                             chrg_cap2_full;
-
-       bool                            is_first_poweron;
-       int                             first_on_cap;
-
-
-       int                             fg_drv_mode;
-       int                             test_chrg_current;
-       int                             test_chrg_ilmt;
-       int                             debug_finish_real_soc;
-       int                             debug_finish_temp_soc;
-       int                             chrg_min[10];
-       int                             chg_v_lmt;
-       int                             chg_i_lmt;
-       int                             chg_i_cur;
-
+       int                             dsoc;
+       int                             rsoc;
+       int                             poffset;
+       int                             age_ocv_soc;
+       bool                            age_allow_update;
+       int                             age_level;
+       int                             age_ocv_cap;
+       int                             age_voltage;
+       int                             age_adjust_cap;
+       unsigned long                   age_keep_sec;
+       int                             zero_timeout_cnt;
+       int                             zero_remain_cap;
+       int                             zero_dsoc;
+       int                             zero_linek;
+       u64                             zero_drop_sec;
+       u64                             shtd_drop_sec;
+       int                             sm_remain_cap;
+       int                             sm_linek;
+       int                             sm_chrg_dsoc;
+       int                             sm_dischrg_dsoc;
+       int                             algo_rest_val;
+       int                             algo_rest_mode;
+       int                             sleep_sum_cap;
+       int                             sleep_remain_cap;
+       unsigned long                   sleep_dischrg_sec;
+       unsigned long                   sleep_sum_sec;
+       bool                            sleep_chrg_online;
+       u8                              sleep_chrg_status;
+       bool                            adc_allow_update;
+       int                             fb_blank;
+       bool                            s2r; /*suspend to resume*/
+       u32                             work_mode;
+       int                             temperature;
+       u32                             monitor_ms;
+       u32                             pwroff_min;
+       u32                             adc_calib_cnt;
+       unsigned long                   finish_base;
+       unsigned long                   boot_base;
+       unsigned long                   flat_match_sec;
+       unsigned long                   plug_in_base;
+       unsigned long                   plug_out_base;
+       u8                              halt_cnt;
+       bool                            is_halt;
+       bool                            is_max_soc_offset;
+       bool                            is_sw_reset;
+       bool                            is_ocv_calib;
+       bool                            is_first_on;
+       bool                            is_force_calib;
+       int                             last_dsoc;
+       int                             ocv_pre_dsoc;
+       int                             ocv_new_dsoc;
+       int                             max_pre_dsoc;
+       int                             max_new_dsoc;
+       int                             force_pre_dsoc;
+       int                             force_new_dsoc;
+       int                             dbg_cap_low0;
+       int                             dbg_pwr_dsoc;
+       int                             dbg_pwr_rsoc;
+       int                             dbg_pwr_vol;
+       int                             dbg_chrg_min[10];
+       int                             dbg_meet_soc;
+       int                             dbg_calc_dsoc;
+       int                             dbg_calc_rsoc;
 };
 
-struct battery_info *g_battery;
-u32 support_uboot_chrg, support_usb_adp, support_dc_adp;
-static void rk81x_update_battery_info(struct battery_info *di);
+#define DIV(x) ((x) ? (x) : 1)
 
-static bool rk81x_support_adp_type(enum hw_support_adp_t type)
+static u64 get_boot_sec(void)
 {
-       bool bl = false;
+       struct timespec ts;
 
-       switch (type) {
-       case HW_ADP_TYPE_USB:
-               if (support_usb_adp)
-                       bl = true;
-               break;
-       case HW_ADP_TYPE_DC:
-               if (support_dc_adp)
-                       bl = true;
-               break;
-       case HW_ADP_TYPE_DUAL:
-               if (support_usb_adp && support_dc_adp)
-                       bl = true;
-               break;
-       default:
-                       break;
-       }
+       get_monotonic_boottime(&ts);
+
+       return ts.tv_sec;
+}
+
+static unsigned long base2sec(unsigned long x)
+{
+       if (x)
+               return (get_boot_sec() > x) ? (get_boot_sec() - x) : 0;
+       else
+               return 0;
+}
 
-       return bl;
+static unsigned long base2min(unsigned long x)
+{
+       return base2sec(x) / 60;
 }
 
 static u32 interpolate(int value, u32 *table, int size)
 {
-       uint8_t i;
-       uint16_t d;
+       u8 i;
+       u16 d;
 
        for (i = 0; i < size; i++) {
                if (value < table[i])
@@ -310,11 +266,11 @@ static u32 interpolate(int value, u32 *table, int size)
        }
 
        if ((i > 0) && (i < size)) {
-               d = (value - table[i-1]) * (INTERPOLATE_MAX/(size-1));
-               d /= table[i] - table[i-1];
-               d = d + (i-1) * (INTERPOLATE_MAX/(size-1));
+               d = (value - table[i - 1]) * (MAX_INTERPOLATE / (size - 1));
+               d /= table[i] - table[i - 1];
+               d = d + (i - 1) * (MAX_INTERPOLATE / (size - 1));
        } else {
-               d = i * ((INTERPOLATE_MAX+size/2)/size);
+               d = i * ((MAX_INTERPOLATE + size / 2) / size);
        }
 
        if (d > 1000)
@@ -322,21 +278,19 @@ static u32 interpolate(int value, u32 *table, int size)
 
        return d;
 }
-/* Returns (a * b) / c */
+
+/* (a*b)/c */
 static int32_t ab_div_c(u32 a, u32 b, u32 c)
 {
        bool sign;
        u32 ans = MAX_INT;
-       int32_t tmp;
-
-       sign = ((((a^b)^c) & 0x80000000) != 0);
+       int tmp;
 
+       sign = ((((a ^ b) ^ c) & 0x80000000) != 0);
        if (c != 0) {
                if (sign)
                        c = -c;
-
-               tmp = ((int32_t) a*b + (c>>1)) / c;
-
+               tmp = (a * b + (c >> 1)) / c;
                if (tmp < MAX_INT)
                        ans = tmp;
        }
@@ -347,1010 +301,609 @@ static int32_t ab_div_c(u32 a, u32 b, u32 c)
        return ans;
 }
 
-static  int32_t abs_int(int32_t x)
+static int rk818_bat_read(struct rk818_battery *di, u8 reg)
 {
-       return (x > 0) ? x : -x;
-}
+       int ret, val;
 
-static  int abs32_int(int x)
-{
-       return (x > 0) ? x : -x;
-}
+       ret = regmap_read(di->regmap, reg, &val);
+       if (ret)
+               dev_err(di->dev, "read reg:0x%x failed\n", reg);
 
-static int div(int val)
-{
-       return (val == 0) ? 1 : val;
+       return val;
 }
 
-static int battery_read(struct rk818 *rk818, u8 reg,
-                       u8 buf[], unsigned len)
+static int rk818_bat_write(struct rk818_battery *di, u8 reg, u8 buf)
 {
        int ret;
 
-       ret = rk818_i2c_read(rk818, reg, len, buf);
+       ret = regmap_write(di->regmap, reg, buf);
+       if (ret)
+               dev_err(di->dev, "i2c write reg: 0x%2x error\n", reg);
+
        return ret;
 }
 
-static int battery_write(struct rk818 *rk818, u8 reg,
-                        u8 const buf[], unsigned len)
+static int rk818_bat_set_bits(struct rk818_battery *di, u8 reg, u8 mask, u8 buf)
 {
        int ret;
 
-       ret = rk818_i2c_write(rk818, reg, (int)len, *buf);
-       return ret;
-}
+       ret = regmap_update_bits(di->regmap, reg, mask, buf);
+       if (ret)
+               dev_err(di->dev, "write reg:0x%x failed\n", reg);
 
-static void rk81x_set_bit(struct battery_info *di, u8 reg, u8 shift)
-{
-       rk818_set_bits(di->rk818, reg, 1 << shift, 1 << shift);
+       return ret;
 }
 
-static void rk81x_clr_bit(struct battery_info *di, u8 reg, u8 shift)
+static int rk818_bat_clear_bits(struct rk818_battery *di, u8 reg, u8 mask)
 {
-       rk818_set_bits(di->rk818, reg, 1 << shift, 0 << shift);
-}
+       int ret;
 
-static u8 rk81x_read_bit(struct battery_info *di, u8 reg, u8 shift)
-{
-       u8 buf;
-       u8 val;
+       ret = regmap_update_bits(di->regmap, reg, mask, 0);
+       if (ret)
+               dev_err(di->dev, "clr reg:0x%02x failed\n", reg);
 
-       battery_read(di->rk818, reg, &buf, 1);
-       val = (buf & BIT(shift)) >> shift;
-       return val;
+       return ret;
 }
 
-static void dump_gauge_register(struct battery_info *di)
+static void rk818_bat_dump_regs(struct rk818_battery *di, u8 start, u8 end)
 {
-       int i = 0;
-       char buf;
-
-       DBG("%s dump charger register start:\n", __func__);
-       for (i = 0xAC; i < 0xDF; i++) {
-               battery_read(di->rk818, i, &buf, 1);
-               DBG(" the register is  0x%02x, the value is 0x%02x\n", i, buf);
-       }
-       DBG("demp end!\n");
-}
+       int i;
 
-static void dump_charger_register(struct battery_info *di)
-{
-       int i = 0;
-       char buf;
+       if (!dbg_enable)
+               return;
 
-       DBG("%s dump the register start:\n", __func__);
-       for (i = 0x99; i < 0xAB; i++) {
-               battery_read(di->rk818, i, &buf, 1);
-               DBG(" the register is  0x%02x, the value is 0x%02x\n", i, buf);
-       }
-       DBG("demp end!\n");
+       DBG("dump regs from: 0x%x-->0x%x\n", start, end);
+       for (i = start; i < end; i++)
+               DBG("0x%x: 0x%0x\n", i, rk818_bat_read(di, i));
 }
 
-#if RK818_SYS_DBG
-
-static void  _capacity_init(struct battery_info *di, u32 capacity);
-
-/*
- * interface for debug: do rsoc_first_poweron_init() without unloading battery
- */
-static ssize_t bat_calib_read(struct device *dev,
-                             struct device_attribute *attr, char *buf)
+static bool rk818_bat_chrg_online(struct rk818_battery *di)
 {
-       struct battery_info *di = g_battery;
-       int val;
+       u8 buf;
 
-       val = rk81x_read_bit(di, MISC_MARK_REG, OCV_CALIB_SHIFT);
-       return sprintf(buf, "%d\n", val);
+       buf = rk818_bat_read(di, RK818_VB_MON_REG);
+
+       return (buf & PLUG_IN_STS) ? true : false;
 }
 
-static ssize_t bat_calib_write(struct device *dev,
-                              struct device_attribute *attr,
-                              const char *buf, size_t count)
+static int rk818_bat_get_coulomb_cap(struct rk818_battery *di)
 {
-       u8 val;
-       int ret;
-       struct battery_info *di = g_battery;
+       int val = 0;
 
-       ret = kstrtou8(buf, 0, &val);
-       if (ret < 0)
-               return ret;
+       val |= rk818_bat_read(di, RK818_GASCNT3_REG) << 24;
+       val |= rk818_bat_read(di, RK818_GASCNT2_REG) << 16;
+       val |= rk818_bat_read(di, RK818_GASCNT1_REG) << 8;
+       val |= rk818_bat_read(di, RK818_GASCNT0_REG) << 0;
 
-       if (val)
-               rk81x_set_bit(di, MISC_MARK_REG, OCV_CALIB_SHIFT);
-       else
-               rk81x_clr_bit(di, MISC_MARK_REG, OCV_CALIB_SHIFT);
-       return count;
+       return (val / 2390) * di->res_div;
 }
 
-/*
- * interface for debug: force battery to over discharge
- */
-static ssize_t bat_test_power_read(struct device *dev,
-                                  struct device_attribute *attr, char *buf)
+static int rk818_bat_get_rsoc(struct rk818_battery *di)
 {
-       struct battery_info *di = g_battery;
+       int remain_cap;
 
-       return sprintf(buf, "%d\n", di->fg_drv_mode);
+       remain_cap = rk818_bat_get_coulomb_cap(di);
+       return (remain_cap + di->fcc / 200) * 100 / DIV(di->fcc);
 }
 
-static ssize_t bat_test_power_write(struct device *dev,
-                                   struct device_attribute *attr,
-                                   const char *buf, size_t count)
+static ssize_t bat_info_store(struct device *dev, struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
-       u8 val;
-       int ret;
-       struct battery_info *di = g_battery;
+       char cmd;
+       struct rk818_battery *di = dev_get_drvdata(dev);
 
-       ret = kstrtou8(buf, 0, &val);
-       if (ret < 0)
-               return ret;
+       sscanf(buf, "%c", &cmd);
 
-       if (val == 1)
-               di->fg_drv_mode = TEST_POWER_MODE;
+       if (cmd == 'n')
+               rk818_bat_set_bits(di, RK818_MISC_MARK_REG,
+                                  FG_RESET_NOW, FG_RESET_NOW);
+       else if (cmd == 'm')
+               rk818_bat_set_bits(di, RK818_MISC_MARK_REG,
+                                  FG_RESET_LATE, FG_RESET_LATE);
+       else if (cmd == 'c')
+               rk818_bat_clear_bits(di, RK818_MISC_MARK_REG,
+                                    FG_RESET_LATE | FG_RESET_NOW);
+       else if (cmd == 'r')
+               BAT_INFO("0x%2x\n", rk818_bat_read(di, RK818_MISC_MARK_REG));
        else
-               di->fg_drv_mode = FG_NORMAL_MODE;
+               BAT_INFO("command error\n");
 
        return count;
 }
 
+static struct device_attribute rk818_bat_attr[] = {
+       __ATTR(bat, 0664, NULL, bat_info_store),
+};
 
-static ssize_t bat_state_read(struct device *dev,
-                             struct device_attribute *attr, char *buf)
+static void rk818_bat_enable_gauge(struct rk818_battery *di)
 {
-       struct battery_info *di = g_battery;
+       u8 buf;
 
-       return sprintf(buf, "dsoc = %d, rsoc = %d\n",
-                               di->real_soc, di->temp_soc);
+       buf = rk818_bat_read(di, RK818_TS_CTRL_REG);
+       buf |= GG_EN;
+       rk818_bat_write(di, RK818_TS_CTRL_REG, buf);
 }
 
-static ssize_t bat_fcc_read(struct device *dev,
-                           struct device_attribute *attr, char *buf)
+static void rk818_bat_save_age_level(struct rk818_battery *di, u8 level)
 {
-       struct battery_info *di = g_battery;
-
-       return sprintf(buf, "%d", di->fcc);
+       rk818_bat_write(di, RK818_UPDAT_LEVE_REG, level);
 }
 
-static ssize_t bat_fcc_write(struct device *dev,
-                            struct device_attribute *attr,
-                            const char *buf, size_t count)
+static u8 rk818_bat_get_age_level(struct  rk818_battery *di)
 {
-       u16 val;
-       int ret;
-       struct battery_info *di = g_battery;
-
-       ret = kstrtou16(buf, 0, &val);
-       if (ret < 0)
-               return ret;
-
-       di->fcc = val;
-
-       return count;
+       return rk818_bat_read(di, RK818_UPDAT_LEVE_REG);
 }
 
-
-static ssize_t bat_soc_read(struct device *dev,
-                           struct device_attribute *attr, char *buf)
+static int rk818_bat_get_vcalib0(struct rk818_battery *di)
 {
-       struct battery_info *di = g_battery;
+       int val = 0;
 
-       return sprintf(buf, "%d", di->real_soc);
+       val |= rk818_bat_read(di, RK818_VCALIB0_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_VCALIB0_REGH) << 8;
+
+       DBG("<%s>. voffset0: 0x%x\n", __func__, val);
+       return val;
 }
 
-static ssize_t bat_soc_write(struct device *dev,
-                            struct device_attribute *attr,
-                            const char *buf, size_t count)
+static int rk818_bat_get_vcalib1(struct rk818_battery *di)
 {
-       u8 val;
-       int ret;
-       struct battery_info *di = g_battery;
-
-       ret = kstrtou8(buf, 0, &val);
-       if (ret < 0)
-               return ret;
-
-       di->real_soc = val;
+       int val = 0;
 
-       return count;
-}
-static ssize_t bat_temp_soc_read(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-       struct battery_info *di = g_battery;
+       val |= rk818_bat_read(di, RK818_VCALIB1_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_VCALIB1_REGH) << 8;
 
-       return sprintf(buf, "%d", di->temp_soc);
+       DBG("<%s>. voffset1: 0x%x\n", __func__, val);
+       return val;
 }
 
-static ssize_t bat_temp_soc_write(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t count)
+static int rk818_bat_get_ioffset(struct rk818_battery *di)
 {
-       u8 val;
-       int ret;
-       u32 capacity;
-       struct battery_info *di = g_battery;
-
-       ret = kstrtou8(buf, 0, &val);
-       if (ret < 0)
-               return ret;
+       int val = 0;
 
-       capacity = di->fcc*val/100;
-       _capacity_init(di, capacity);
+       val |= rk818_bat_read(di, RK818_IOFFSET_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_IOFFSET_REGH) << 8;
 
-       return count;
+       DBG("<%s>. ioffset: 0x%x\n", __func__, val);
+       return val;
 }
 
-static ssize_t bat_voltage_read(struct device *dev,
-                               struct device_attribute *attr, char *buf)
+static int rk818_bat_get_coffset(struct rk818_battery *di)
 {
-       struct battery_info *di = g_battery;
-
-       return sprintf(buf, "%d", di->voltage);
-}
+       int val = 0;
 
-static ssize_t bat_avr_current_read(struct device *dev,
-                                   struct device_attribute *attr, char *buf)
-{
-       struct battery_info *di = g_battery;
+       val |= rk818_bat_read(di, RK818_CAL_OFFSET_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_CAL_OFFSET_REGH) << 8;
 
-       return sprintf(buf, "%d", di->current_avg);
+       DBG("<%s>. coffset: 0x%x\n", __func__, val);
+       return val;
 }
 
-static ssize_t bat_remain_cap_read(struct device *dev,
-                                  struct device_attribute *attr,
-                                  char *buf)
+static void rk818_bat_set_coffset(struct rk818_battery *di, int val)
 {
-       struct battery_info *di = g_battery;
+       u8 buf;
 
-       return sprintf(buf, "%d", di->remain_capacity);
+       if ((val < INVALID_COFFSET_MIN) || (val > INVALID_COFFSET_MAX)) {
+               BAT_INFO("set invalid coffset=0x%x\n", val);
+               return;
+       }
+
+       buf = (val >> 8) & 0xff;
+       rk818_bat_write(di, RK818_CAL_OFFSET_REGH, buf);
+       buf = (val >> 0) & 0xff;
+       rk818_bat_write(di, RK818_CAL_OFFSET_REGL, buf);
+       DBG("<%s>. coffset: 0x%x\n", __func__, val);
 }
 
-/*
- * interface for debug: debug info switch
- */
-static ssize_t bat_debug_write(struct device *dev,
-                              struct device_attribute *attr,
-                              const char *buf, size_t count)
+static void rk818_bat_init_voltage_kb(struct rk818_battery *di)
 {
-       u8 val;
-       int ret;
-
-       ret = kstrtou8(buf, 0, &val);
-       if (ret < 0)
-               return ret;
+       int vcalib0, vcalib1;
 
-       dbg_enable = val;
+       vcalib0 = rk818_bat_get_vcalib0(di);
+       vcalib1 = rk818_bat_get_vcalib1(di);
+       di->voltage_k = (4200 - 3000) * 1000 / DIV(vcalib1 - vcalib0);
+       di->voltage_b = 4200 - (di->voltage_k * vcalib1) / 1000;
 
-       return count;
+       DBG("voltage_k=%d(*1000),voltage_b=%d\n", di->voltage_k, di->voltage_b);
 }
 
-static ssize_t bat_regs_read(struct device *dev,
-                            struct device_attribute *attr, char *buf)
+static int rk818_bat_get_ocv_voltage(struct rk818_battery *di)
 {
-       u32 i;
-       u32 start_offset = 0x0;
-       u32 end_offset = 0xf2;
-       struct battery_info *di = g_battery;
-       u8 val;
-       char *str = buf;
+       int vol, val = 0;
 
-       str += sprintf(str, "start from add=0x%x, offset=0x%x\n",
-                      start_offset, end_offset);
+       val |= rk818_bat_read(di, RK818_BAT_OCV_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_BAT_OCV_REGH) << 8;
 
-       for (i = start_offset; i <= end_offset; ) {
-               battery_read(di->rk818, i, &val, 1);
-               str += sprintf(str, "0x%x=0x%x", i, val);
+       vol = di->voltage_k * val / 1000 + di->voltage_b;
 
-               if (i % 4 == 0) {
-                       str += sprintf(str, "\n");
-               } else {
-                       if (i != end_offset)
-                               str += sprintf(str, "   ");
-                       else
-                               str += sprintf(str, "\n");
-               }
-               i++;
-       }
-       return (str - buf);
+       return vol;
 }
 
+static int rk818_bat_get_avg_voltage(struct rk818_battery *di)
+{
+       int vol, val = 0;
 
-static struct device_attribute rk818_bat_attr[] = {
-       __ATTR(fcc, 0664, bat_fcc_read, bat_fcc_write),
-       __ATTR(soc, 0664, bat_soc_read, bat_soc_write),
-       __ATTR(temp_soc, 0664, bat_temp_soc_read, bat_temp_soc_write),
-       __ATTR(voltage, 0664, bat_voltage_read, NULL),
-       __ATTR(avr_current, 0664, bat_avr_current_read, NULL),
-       __ATTR(remain_capacity, 0664, bat_remain_cap_read, NULL),
-       __ATTR(debug, 0664, NULL, bat_debug_write),
-       __ATTR(regs, 0664, bat_regs_read, NULL),
-       __ATTR(state, 0664, bat_state_read, NULL),
-       __ATTR(test_power, 0664, bat_test_power_read, bat_test_power_write),
-       __ATTR(calib, 0664, bat_calib_read, bat_calib_write),
-};
+       val |= rk818_bat_read(di, RK818_BAT_VOL_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_BAT_VOL_REGH) << 8;
 
-#endif
+       vol = di->voltage_k * val / 1000 + di->voltage_b;
 
-static uint16_t get_relax_voltage(struct battery_info *di);
+       return vol;
+}
 
-static ssize_t show_state_attrs(struct device *dev,
-                               struct device_attribute *attr, char *buf)
+static bool is_rk818_bat_relax_mode(struct rk818_battery *di)
 {
-       struct battery_info *data = g_battery;
-
-       if (0 == get_relax_voltage(data)) {
-               return sprintf(buf,
-                       "voltage = %d, remain_capacity = %d, status = %d\n",
-                       data->voltage, data->remain_capacity,
-                       data->status);
+       u8 status;
 
-       } else
-               return sprintf(buf,
-                       "voltage = %d, remain_capacity = %d, status = %d\n",
-                       get_relax_voltage(data), data->remain_capacity,
-                       data->status);
+       status = rk818_bat_read(di, RK818_GGSTS_REG);
+       if (!(status & RELAX_VOL1_UPD) || !(status & RELAX_VOL2_UPD))
+               return false;
+       else
+               return true;
 }
 
-static ssize_t restore_state_attrs(struct device *dev,
-                                  struct device_attribute *attr,
-                                  const char *buf, size_t size)
+static u16 rk818_bat_get_relax_vol1(struct rk818_battery *di)
 {
-       return size;
-}
-static struct device_attribute rkbatt_attrs[] = {
-       __ATTR(state, 0664, show_state_attrs, restore_state_attrs),
-};
+       u16 vol, val = 0;
 
-static int create_sysfs_interfaces(struct device *dev)
-{
-       int i;
+       val |= rk818_bat_read(di, RK818_RELAX_VOL1_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_RELAX_VOL1_REGH) << 8;
+       vol = di->voltage_k * val / 1000 + di->voltage_b;
 
-       for (i = 0; i < ARRAY_SIZE(rkbatt_attrs); i++) {
-               if (device_create_file(dev, rkbatt_attrs + i))
-                       goto error;
-       }
+       return vol;
+}
 
-       return 0;
+static u16 rk818_bat_get_relax_vol2(struct rk818_battery *di)
+{
+       u16 vol, val = 0;
 
-error:
-       for (; i >= 0; i--)
-               device_remove_file(dev, rkbatt_attrs + i);
+       val |= rk818_bat_read(di, RK818_RELAX_VOL2_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_RELAX_VOL2_REGH) << 8;
+       vol = di->voltage_k * val / 1000 + di->voltage_b;
 
-       dev_err(dev, "%s:Unable to create sysfs interface\n", __func__);
-       return -1;
+       return vol;
 }
 
-static int  _gauge_enable(struct battery_info *di)
+static u16 rk818_bat_get_relax_voltage(struct rk818_battery *di)
 {
-       int ret;
-       u8 buf;
-
+       u16 relax_vol1, relax_vol2;
 
-       ret = battery_read(di->rk818, TS_CTRL_REG, &buf, 1);
-       if (ret < 0) {
-               dev_err(di->dev, "error reading TS_CTRL_REG");
-               return ret;
-       }
-       if (!(buf & GG_EN)) {
-               buf |= GG_EN;
-               ret = battery_write(di->rk818, TS_CTRL_REG, &buf, 1);/*enable*/
-               ret = battery_read(di->rk818, TS_CTRL_REG, &buf, 1);
+       if (!is_rk818_bat_relax_mode(di))
                return 0;
-       }
 
-       DBG("%s, %d\n", __func__, buf);
-       return 0;
+       relax_vol1 = rk818_bat_get_relax_vol1(di);
+       relax_vol2 = rk818_bat_get_relax_vol2(di);
+
+       return relax_vol1 > relax_vol2 ? relax_vol1 : relax_vol2;
 }
 
-static void save_level(struct  battery_info *di, u8 save_soc)
+static int rk818_bat_get_avg_current(struct rk818_battery *di)
 {
-       u8 soc;
+       int cur, val = 0;
 
-       soc = save_soc;
-       battery_write(di->rk818, UPDAT_LEVE_REG, &soc, 1);
-}
-static u8 get_level(struct  battery_info *di)
-{
-       u8 soc;
+       val |= rk818_bat_read(di, RK818_BAT_CUR_AVG_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_BAT_CUR_AVG_REGH) << 8;
 
-       battery_read(di->rk818, UPDAT_LEVE_REG, &soc, 1);
-       return soc;
+       if (val & 0x800)
+               val -= 4096;
+       cur = val * di->res_div * 1506 / 1000;
+
+       return cur;
 }
 
-static int _get_vcalib0(struct battery_info *di)
+static int rk818_bat_vol_to_ocvsoc(struct rk818_battery *di, int voltage)
 {
-       int ret;
-       int temp = 0;
-       u8 buf;
+       u32 *ocv_table, temp;
+       int ocv_size, ocv_soc;
 
-       ret = battery_read(di->rk818, VCALIB0_REGL, &buf, 1);
-       temp = buf;
-       ret = battery_read(di->rk818, VCALIB0_REGH, &buf, 1);
-       temp |= buf<<8;
+       ocv_table = di->pdata->ocv_table;
+       ocv_size = di->pdata->ocv_size;
+       temp = interpolate(voltage, ocv_table, ocv_size);
+       ocv_soc = ab_div_c(temp, MAX_PERCENTAGE, MAX_INTERPOLATE);
 
-       DBG("%s voltage0 offset vale is %d\n", __func__, temp);
-       return temp;
+       return ocv_soc;
 }
 
-static int _get_vcalib1(struct  battery_info *di)
+static int rk818_bat_vol_to_ocvcap(struct rk818_battery *di, int voltage)
 {
-       int ret;
-       int temp = 0;
-       u8 buf;
+       u32 *ocv_table, temp;
+       int ocv_size, cap;
 
-       ret = battery_read(di->rk818, VCALIB1_REGL, &buf, 1);
-       temp = buf;
-       ret = battery_read(di->rk818, VCALIB1_REGH, &buf, 1);
-       temp |= buf<<8;
+       ocv_table = di->pdata->ocv_table;
+       ocv_size = di->pdata->ocv_size;
+       temp = interpolate(voltage, ocv_table, ocv_size);
+       cap = ab_div_c(temp, di->fcc, MAX_INTERPOLATE);
 
-       DBG("%s voltage1 offset vale is %d\n", __func__, temp);
-       return temp;
+       return cap;
 }
 
-static int _get_ioffset(struct battery_info *di)
+static int rk818_bat_vol_to_zerosoc(struct rk818_battery *di, int voltage)
 {
-       int ret;
-       int temp = 0;
-       u8 buf;
+       u32 *ocv_table, temp;
+       int ocv_size, ocv_soc;
 
-       ret = battery_read(di->rk818, IOFFSET_REGL, &buf, 1);
-       temp = buf;
-       ret = battery_read(di->rk818, IOFFSET_REGH, &buf, 1);
-       temp |= buf<<8;
+       ocv_table = di->pdata->zero_table;
+       ocv_size = di->pdata->ocv_size;
+       temp = interpolate(voltage, ocv_table, ocv_size);
+       ocv_soc = ab_div_c(temp, MAX_PERCENTAGE, MAX_INTERPOLATE);
 
-       return temp;
+       return ocv_soc;
 }
 
-static uint16_t  _get_cal_offset(struct battery_info *di)
+static int rk818_bat_vol_to_zerocap(struct rk818_battery *di, int voltage)
 {
-       int ret;
-       uint16_t temp = 0;
-       u8 buf;
+       u32 *ocv_table, temp;
+       int ocv_size, cap;
 
-       ret = battery_read(di->rk818, CAL_OFFSET_REGL, &buf, 1);
-       temp = buf;
-       ret = battery_read(di->rk818, CAL_OFFSET_REGH, &buf, 1);
-       temp |= buf<<8;
+       ocv_table = di->pdata->zero_table;
+       ocv_size = di->pdata->ocv_size;
+       temp = interpolate(voltage, ocv_table, ocv_size);
+       cap = ab_div_c(temp, di->fcc, MAX_INTERPOLATE);
 
-       return temp;
+       return cap;
 }
-static int _set_cal_offset(struct battery_info *di, u32 value)
-{
-       int ret;
-       u8 buf;
 
-       buf = value&0xff;
-       ret = battery_write(di->rk818, CAL_OFFSET_REGL, &buf, 1);
-       buf = (value >> 8)&0xff;
-       ret = battery_write(di->rk818, CAL_OFFSET_REGH, &buf, 1);
-
-       return 0;
-}
-static void _get_voltage_offset_value(struct battery_info *di)
+static int rk818_bat_get_iadc(struct rk818_battery *di)
 {
-       int vcalib0, vcalib1;
+       int val = 0;
 
-       vcalib0 = _get_vcalib0(di);
-       vcalib1 = _get_vcalib1(di);
+       val |= rk818_bat_read(di, RK818_BAT_CUR_AVG_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_BAT_CUR_AVG_REGH) << 8;
+       if (val > 2047)
+               val -= 4096;
 
-       di->voltage_k = (4200 - 3000)*1000/div((vcalib1 - vcalib0));
-       di->voltage_b = 4200 - (di->voltage_k*vcalib1)/1000;
-       DBG("voltage_k=%d(x1000),voltage_b=%d\n", di->voltage_k, di->voltage_b);
+       return val;
 }
-static uint16_t _get_OCV_voltage(struct battery_info *di)
+
+static bool rk818_bat_adc_calib(struct rk818_battery *di)
 {
-       int ret;
-       u8 buf;
-       uint16_t temp;
-       uint16_t voltage_now = 0;
-       int i;
-       int val[3];
+       int i, ioffset, coffset, adc, save_coffset;
 
-       for (i = 0; i < 3; i++) {
-               ret = battery_read(di->rk818, BAT_OCV_REGL, &buf, 1);
-               val[i] = buf;
-               ret = battery_read(di->rk818, BAT_OCV_REGH, &buf, 1);
-               val[i] |= buf<<8;
+       if ((di->chrg_status != CHARGE_FINISH) ||
+           (di->adc_calib_cnt > ADC_CALIB_CNT) ||
+           (base2min(di->boot_base) < ADC_CALIB_LMT_MIN) ||
+           (abs(di->current_avg) < ADC_CALIB_THRESHOLD))
+               return false;
 
-               if (ret < 0) {
-                       dev_err(di->dev, "error read BAT_OCV_REGH");
-                       return ret;
+       di->adc_calib_cnt++;
+       save_coffset = rk818_bat_get_coffset(di);
+       for (i = 0; i < 5; i++) {
+               adc = rk818_bat_get_iadc(di);
+               if (!rk818_bat_chrg_online(di)) {
+                       rk818_bat_set_coffset(di, save_coffset);
+                       BAT_INFO("quit, charger plugout when calib adc\n");
+                       return false;
+               }
+               coffset = rk818_bat_get_coffset(di);
+               rk818_bat_set_coffset(di, coffset + adc);
+               msleep(2000);
+               adc = rk818_bat_get_iadc(di);
+               if (abs(adc) < ADC_CALIB_THRESHOLD) {
+                       coffset = rk818_bat_get_coffset(di);
+                       ioffset = rk818_bat_get_ioffset(di);
+                       di->poffset = coffset - ioffset;
+                       rk818_bat_write(di, RK818_POFFSET_REG, di->poffset);
+                       BAT_INFO("new offset:c=0x%x, i=0x%x, p=0x%x\n",
+                                coffset, ioffset, di->poffset);
+                       return true;
+               } else {
+                       BAT_INFO("coffset calib again %d.., max_cnt=%d\n",
+                                i, di->adc_calib_cnt);
+                       rk818_bat_set_coffset(di, coffset);
+                       msleep(2000);
                }
        }
 
-       if (val[0] == val[1])
-               temp = val[0];
-       else
-               temp = val[2];
-
-       voltage_now = di->voltage_k*temp/1000 + di->voltage_b;
+       rk818_bat_set_coffset(di, save_coffset);
 
-       return voltage_now;
+       return false;
 }
 
-static int _get_battery_voltage(struct battery_info *di)
+static void rk818_bat_set_ioffset_sample(struct rk818_battery *di)
 {
-       int ret;
-       int voltage_now = 0;
-       u8 buf;
-       int temp;
-       int val[3];
-       int i;
-
-       for (i = 0; i < 3; i++) {
-               ret = battery_read(di->rk818, BAT_VOL_REGL, &buf, 1);
-               val[i] = buf;
-               ret = battery_read(di->rk818, BAT_VOL_REGH, &buf, 1);
-               val[i] |= buf<<8;
+       u8 ggcon;
 
-               if (ret < 0) {
-                       dev_err(di->dev, "error read BAT_VOL_REGH");
-                       return ret;
-               }
-       }
-       /*check value*/
-       if (val[0] == val[1])
-               temp = val[0];
-       else
-               temp = val[2];
+       ggcon = rk818_bat_read(di, RK818_GGCON_REG);
+       ggcon &= ~ADC_CAL_MIN_MSK;
+       ggcon |= ADC_CAL_8MIN;
+       rk818_bat_write(di, RK818_GGCON_REG, ggcon);
+}
 
-       voltage_now = di->voltage_k*temp/1000 + di->voltage_b;
+static void rk818_bat_set_ocv_sample(struct rk818_battery *di)
+{
+       u8 ggcon;
 
-       return voltage_now;
+       ggcon = rk818_bat_read(di, RK818_GGCON_REG);
+       ggcon &= ~OCV_SAMP_MIN_MSK;
+       ggcon |= OCV_SAMP_8MIN;
+       rk818_bat_write(di, RK818_GGCON_REG, ggcon);
 }
 
-/* OCV Lookup table
- * Open Circuit Voltage (OCV) correction routine. This function estimates SOC,
- * based on the voltage.
- */
-static int _voltage_to_capacity(struct battery_info *di, int voltage)
+static void rk818_bat_restart_relax(struct rk818_battery *di)
 {
-       u32 *ocv_table;
-       int ocv_size;
-       u32 tmp;
-       int ocv_soc;
-
-       ocv_table = di->platform_data->battery_ocv;
-       ocv_size = di->platform_data->ocv_size;
-       di->warnning_voltage = ocv_table[3];
-       tmp = interpolate(voltage, ocv_table, ocv_size);
-       ocv_soc = ab_div_c(tmp, MAX_PERCENTAGE, INTERPOLATE_MAX);
-       di->temp_nac = ab_div_c(tmp, di->fcc, INTERPOLATE_MAX);
+       u8 ggsts;
 
-       return ocv_soc;
+       ggsts = rk818_bat_read(di, RK818_GGSTS_REG);
+       ggsts &= ~RELAX_VOL12_UPD_MSK;
+       rk818_bat_write(di, RK818_GGSTS_REG, ggsts);
 }
 
-static uint16_t _get_relax_vol1(struct battery_info *di)
+static void rk818_bat_set_relax_sample(struct rk818_battery *di)
 {
-       int ret;
        u8 buf;
-       uint16_t temp = 0, voltage_now;
+       int enter_thres, exit_thres;
+       struct battery_platform_data *pdata = di->pdata;
+
+       enter_thres = pdata->sleep_enter_current * 1000 / 1506 / DIV(di->res_div);
+       exit_thres = pdata->sleep_exit_current * 1000 / 1506 / DIV(di->res_div);
 
-       ret = battery_read(di->rk818, RELAX_VOL1_REGL, &buf, 1);
-       temp = buf;
-       ret = battery_read(di->rk818, RELAX_VOL1_REGH, &buf, 1);
-       temp |= (buf<<8);
+       /* set relax enter and exit threshold */
+       buf = enter_thres & 0xff;
+       rk818_bat_write(di, RK818_RELAX_ENTRY_THRES_REGL, buf);
+       buf = (enter_thres >> 8) & 0xff;
+       rk818_bat_write(di, RK818_RELAX_ENTRY_THRES_REGH, buf);
 
-       voltage_now = di->voltage_k*temp/1000 + di->voltage_b;
+       buf = exit_thres & 0xff;
+       rk818_bat_write(di, RK818_RELAX_EXIT_THRES_REGL, buf);
+       buf = (exit_thres >> 8) & 0xff;
+       rk818_bat_write(di, RK818_RELAX_EXIT_THRES_REGH, buf);
 
-       return voltage_now;
+       /* reset relax update state */
+       rk818_bat_restart_relax(di);
+       DBG("<%s>. sleep_enter_current = %d, sleep_exit_current = %d\n",
+           __func__, pdata->sleep_enter_current, pdata->sleep_exit_current);
 }
 
-static uint16_t _get_relax_vol2(struct battery_info *di)
+static bool is_rk818_bat_exist(struct rk818_battery *di)
 {
-       int ret;
-       uint16_t temp = 0, voltage_now;
-       u8 buf;
-
-       ret = battery_read(di->rk818, RELAX_VOL2_REGL, &buf, 1);
-       temp = buf;
-       ret = battery_read(di->rk818, RELAX_VOL2_REGH, &buf, 1);
-       temp |= (buf<<8);
-
-       voltage_now = di->voltage_k*temp/1000 + di->voltage_b;
-
-       return voltage_now;
+       return (rk818_bat_read(di, RK818_SUP_STS_REG) & BAT_EXS) ? true : false;
 }
 
-static int  _get_raw_adc_current(struct battery_info *di)
+static bool is_rk818_bat_first_pwron(struct rk818_battery *di)
 {
        u8 buf;
-       int ret;
-       int current_now;
-
-       ret = battery_read(di->rk818, BAT_CUR_AVG_REGL, &buf, 1);
-       if (ret < 0) {
-               dev_err(di->dev, "error reading BAT_CUR_AVG_REGL");
-               return ret;
-       }
-       current_now = buf;
-       ret = battery_read(di->rk818, BAT_CUR_AVG_REGH, &buf, 1);
-       if (ret < 0) {
-               dev_err(di->dev, "error reading BAT_CUR_AVG_REGH");
-               return ret;
-       }
-       current_now |= (buf<<8);
 
-       if (ret < 0) {
-               dev_err(di->dev, "error reading BAT_CUR_AVG_REGH");
-               return ret;
+       buf = rk818_bat_read(di, RK818_GGSTS_REG);
+       if (buf & BAT_CON) {
+               buf &= ~BAT_CON;
+               rk818_bat_write(di, RK818_GGSTS_REG, buf);
+               return true;
        }
 
-       return current_now;
+       return false;
 }
 
-static void reset_zero_var(struct battery_info *di)
+static u8 rk818_bat_get_pwroff_min(struct rk818_battery *di)
 {
-       di->update_k = 0;
-       di->q_err = 0;
-       di->voltage_old = 0;
-       di->display_soc = 0;
-}
+       u8 cur, last;
 
-static void ioffset_sample_time(struct battery_info *di, int time)
-{
-       u8 ggcon;
+       cur = rk818_bat_read(di, RK818_NON_ACT_TIMER_CNT_REG);
+       last = rk818_bat_read(di, RK818_NON_ACT_TIMER_CNT_SAVE_REG);
+       rk818_bat_write(di, RK818_NON_ACT_TIMER_CNT_SAVE_REG, cur);
 
-       battery_read(di->rk818, GGCON, &ggcon, 1);
-       ggcon &= ~(0x30); /*clear <5:4>*/
-       ggcon |= time;
-       battery_write(di->rk818, GGCON, &ggcon, 1);
+       return (cur != last) ? cur : 0;
 }
 
-static void update_cal_offset(struct battery_info *di)
+static u8 is_rk818_bat_initialized(struct rk818_battery *di)
 {
-       int mod = di->queue_work_cnt % TIME_10MIN_SEC;
-       u8 pcb_offset;
+       u8 val = rk818_bat_read(di, RK818_MISC_MARK_REG);
 
-       battery_read(di->rk818, PCB_IOFFSET_REG, &pcb_offset, 1);
-       DBG("<%s>, queue_work_cnt = %lu, mod = %d\n",
-           __func__, di->queue_work_cnt, mod);
-       if ((!mod) && (di->pcb_ioffset_updated)) {
-               _set_cal_offset(di, _get_ioffset(di)+pcb_offset);
-               DBG("<%s>. 10min update cal_offset = %d",
-                   __func__, di->pcb_ioffset+_get_ioffset(di));
+       if (val & FG_INIT) {
+               val &= ~FG_INIT;
+               rk818_bat_write(di, RK818_MISC_MARK_REG, val);
+               return true;
+       } else {
+               return false;
        }
 }
 
-/*
- * when charger finish signal comes, we need calibrate the current, make it
- * close to 0.
- */
-static void zero_current_calib(struct battery_info *di)
-{
-       int adc_value;
-       uint16_t C0;
-       uint16_t C1;
-       int ioffset;
-       u8 pcb_offset;
-       u8 retry = 0;
-
-       if ((di->charge_status == CHARGE_FINISH) &&
-           (abs32_int(di->current_avg) > 4)) {
-               for (retry = 0; retry < 5; retry++) {
-                       adc_value = _get_raw_adc_current(di);
-                       if (adc_value > 2047)
-                               adc_value -= 4096;
-
-                       DBG("<%s>. adc_value = %d\n", __func__, adc_value);
-                       C0 = _get_cal_offset(di);
-                       C1 = adc_value + C0;
-                       DBG("<%s>. C0(cal_offset) = %d, C1 = %d\n",
-                           __func__, C0, C1);
-                       _set_cal_offset(di, C1);
-                       DBG("<%s>. new cal_offset = %d\n",
-                           __func__, _get_cal_offset(di));
-                       msleep(2000);
-
-                       adc_value = _get_raw_adc_current(di);
-                       DBG("<%s>. adc_value = %d\n", __func__, adc_value);
-                       if (adc_value < 4) {
-                               if (_get_cal_offset(di) < 0x7ff)
-                                       _set_cal_offset(di, di->current_offset+
-                                                       42);
-                               else {
-                                       ioffset = _get_ioffset(di);
-                                       pcb_offset = C1 - ioffset;
-                                       di->pcb_ioffset = pcb_offset;
-                                       di->pcb_ioffset_updated  = true;
-                                       battery_write(di->rk818,
-                                                     PCB_IOFFSET_REG,
-                                                     &pcb_offset, 1);
-                               }
-                               DBG("<%s>. update the cal_offset, C1 = %d\n"
-                                   "i_offset = %d, pcb_offset = %d\n",
-                                       __func__, C1, ioffset, pcb_offset);
-                               break;
-                       } else {
-                               di->pcb_ioffset_updated  = false;
-                       }
-               }
-       }
-}
-
-
-static bool  _is_relax_mode(struct battery_info *di)
-{
-       int ret;
-       u8 status;
-
-       ret = battery_read(di->rk818, GGSTS, &status, 1);
-
-       if ((!(status&RELAX_VOL1_UPD)) || (!(status&RELAX_VOL2_UPD)))
-               return false;
-       else
-               return true;
-}
-
-static uint16_t get_relax_voltage(struct battery_info *di)
-{
-       int ret;
-       u8 status;
-       uint16_t relax_vol1, relax_vol2;
-       u8 ggcon;
-
-       ret = battery_read(di->rk818, GGSTS, &status, 1);
-       ret = battery_read(di->rk818, GGCON, &ggcon, 1);
-
-       relax_vol1 = _get_relax_vol1(di);
-       relax_vol2 = _get_relax_vol2(di);
-       DBG("<%s>. GGSTS=0x%x, GGCON=0x%x, relax_vol1=%d, relax_vol2=%d\n",
-           __func__, status, ggcon, relax_vol1, relax_vol2);
-
-       if (_is_relax_mode(di))
-               return relax_vol1 > relax_vol2 ? relax_vol1 : relax_vol2;
-       else
-               return 0;
-}
-
-static void  _set_relax_thres(struct battery_info *di)
-{
-       u8 buf;
-       int enter_thres, exit_thres;
-       struct cell_state *cell = &di->cell;
-
-       enter_thres = (cell->config->ocv->sleep_enter_current)*1000/1506;
-       exit_thres = (cell->config->ocv->sleep_exit_current)*1000/1506;
-       DBG("<%s>. sleep_enter_current = %d, sleep_exit_current = %d\n",
-           __func__, cell->config->ocv->sleep_enter_current,
-       cell->config->ocv->sleep_exit_current);
-
-       buf  = enter_thres&0xff;
-       battery_write(di->rk818, RELAX_ENTRY_THRES_REGL, &buf, 1);
-       buf = (enter_thres>>8)&0xff;
-       battery_write(di->rk818, RELAX_ENTRY_THRES_REGH, &buf, 1);
-
-       buf  = exit_thres&0xff;
-       battery_write(di->rk818, RELAX_EXIT_THRES_REGL, &buf, 1);
-       buf = (exit_thres>>8)&0xff;
-       battery_write(di->rk818, RELAX_EXIT_THRES_REGH, &buf, 1);
-
-       /* set sample time */
-       battery_read(di->rk818, GGCON, &buf, 1);
-       buf &= ~(3<<2);/*8min*/
-       buf &= ~0x01; /* clear bat_res calc*/
-       battery_write(di->rk818, GGCON, &buf, 1);
-}
-
-static void restart_relax(struct battery_info *di)
-{
-       u8 ggcon;/* chrg_ctrl_reg2;*/
-       u8 ggsts;
-
-       battery_read(di->rk818, GGCON, &ggcon, 1);
-       ggcon &= ~0x0c;
-       battery_write(di->rk818, GGCON, &ggcon, 1);
-
-       battery_read(di->rk818, GGSTS, &ggsts, 1);
-       ggsts &= ~0x0c;
-       battery_write(di->rk818, GGSTS, &ggsts, 1);
-}
-
-static int  _get_average_current(struct battery_info *di)
-{
-       u8  buf;
-       int ret;
-       int current_now;
-       int temp;
-       int val[3];
-       int i;
-
-       for (i = 0; i < 3; i++) {
-               ret = battery_read(di->rk818, BAT_CUR_AVG_REGL, &buf, 1);
-               if (ret < 0) {
-                       dev_err(di->dev, "error read BAT_CUR_AVG_REGL");
-                       return ret;
-               }
-               val[i] = buf;
-
-               ret = battery_read(di->rk818, BAT_CUR_AVG_REGH, &buf, 1);
-               if (ret < 0) {
-                       dev_err(di->dev, "error read BAT_CUR_AVG_REGH");
-                       return ret;
-               }
-               val[i] |= (buf<<8);
-       }
-       /*check value*/
-       if (val[0] == val[1])
-               current_now = val[0];
-       else
-               current_now = val[2];
-
-       if (current_now & 0x800)
-               current_now -= 4096;
-
-       temp = current_now*1506/1000;/*1000*90/14/4096*500/521;*/
-
-       return temp;
-}
-
-static int is_rk81x_bat_exist(struct  battery_info *di)
-{
-       u8 buf;
-
-       battery_read(di->rk818, SUP_STS_REG, &buf, 1);
-       return (buf & 0x80) ? 1 : 0;
-}
-
-static bool _is_first_poweron(struct  battery_info *di)
+static bool is_rk818_bat_ocv_valid(struct rk818_battery *di)
 {
-       u8 buf;
-       u8 temp;
-
-       battery_read(di->rk818, GGSTS, &buf, 1);
-       DBG("%s GGSTS value is 0x%2x\n", __func__, buf);
-       /*di->pwron_bat_con = buf;*/
-       if (buf&BAT_CON) {
-               buf &= ~(BAT_CON);
-               do {
-                       battery_write(di->rk818, GGSTS, &buf, 1);
-                       battery_read(di->rk818, GGSTS, &temp, 1);
-               } while (temp&BAT_CON);
-               return true;
-       }
-
-       return false;
-}
-static void flatzone_voltage_init(struct battery_info *di)
-{
-       u32 *ocv_table;
-       int ocv_size;
-       int temp_table[21];
-       int i, j;
-
-       ocv_table = di->platform_data->battery_ocv;
-       ocv_size = di->platform_data->ocv_size;
-
-       for (j = 0; j < 21; j++)
-               temp_table[j] = 0;
-
-       j = 0;
-       for (i = 1; i < ocv_size-1; i++) {
-               if (ocv_table[i+1] < ocv_table[i] + 20)
-                       temp_table[j++] = i;
-       }
-
-       temp_table[j] = temp_table[j-1]+1;
-       i = temp_table[0];
-       di->enter_flatzone = ocv_table[i];
-       j = 0;
-
-
-       for (i = 0; i < 20; i++) {
-               if (temp_table[i] < temp_table[i+1])
-                       j = i+1;
-       }
-
-       i = temp_table[j];
-       di->exit_flatzone = ocv_table[i];
-
-       DBG("enter_flatzone = %d exit_flatzone = %d\n",
-           di->enter_flatzone, di->exit_flatzone);
+       return (!di->is_initialized && di->pwroff_min >= 30) ? true : false;
 }
 
-static void power_on_save(struct   battery_info *di, int ocv_voltage)
+static void rk818_bat_init_age_algorithm(struct rk818_battery *di)
 {
-       u8 ocv_valid, first_pwron;
-       u8 save_soc;
-       u8 ocv_soc;
-
-       /*buf==1: OCV_VOL is valid*/
-       ocv_valid = rk81x_read_bit(di, MISC_MARK_REG, OCV_VALID_SHIFT);
-       first_pwron = rk81x_read_bit(di, MISC_MARK_REG, FIRST_PWRON_SHIFT);
-       DBG("readbit: ocv_valid=%d, first_pwron=%d\n", ocv_valid, first_pwron);
+       int age_level, ocv_soc, ocv_cap, ocv_vol;
 
-       if (first_pwron == 1 || ocv_valid == 1) {
+       if (di->is_first_power_on || is_rk818_bat_ocv_valid(di)) {
                DBG("<%s> enter.\n", __func__);
-               ocv_soc = _voltage_to_capacity(di, ocv_voltage);
+               ocv_vol = rk818_bat_get_ocv_voltage(di);
+               ocv_soc = rk818_bat_vol_to_ocvsoc(di, ocv_vol);
+               ocv_cap = rk818_bat_vol_to_ocvcap(di, ocv_vol);
                if (ocv_soc < 20) {
-                       di->dod0_voltage = ocv_voltage;
-                       di->dod0_capacity = di->nac;
-                       di->dod0_status = 1;
-                       di->dod0 = ocv_soc;
-                       di->dod0_level = 80;
+                       di->age_voltage = ocv_vol;
+                       di->age_ocv_cap = ocv_cap;
+                       di->age_ocv_soc = ocv_soc;
+                       di->age_adjust_cap = 0;
 
                        if (ocv_soc <= 0)
-                               di->dod0_level = 100;
+                               di->age_level = 100;
                        else if (ocv_soc < 5)
-                               di->dod0_level = 95;
+                               di->age_level = 95;
                        else if (ocv_soc < 10)
-                               di->dod0_level = 90;
-                       /* save_soc = di->dod0_level; */
-                       save_soc = get_level(di);
-                       if (save_soc <  di->dod0_level)
-                               save_soc = di->dod0_level;
-                       save_level(di, save_soc);
-                       DBG("<%s>: dod0_vol:%d, dod0_cap:%d, dod0:%d, level:%d",
-                           __func__, di->dod0_voltage, di->dod0_capacity,
-                           ocv_soc, save_soc);
+                               di->age_level = 90;
+                       else
+                               di->age_level = 80;
+
+                       age_level = rk818_bat_get_age_level(di);
+                       if (age_level > di->age_level) {
+                               di->age_allow_update = false;
+                               age_level -= 5;
+                               if (age_level <= 80)
+                                       age_level = 80;
+                               rk818_bat_save_age_level(di, age_level);
+                       } else {
+                               di->age_allow_update = true;
+                               di->age_keep_sec = get_boot_sec();
+                       }
+
+                       BAT_INFO("init_age_algorithm: "
+                                "age_vol:%d, age_ocv_cap:%d, "
+                                "age_ocv_soc:%d, old_age_level:%d, "
+                                "age_allow_update:%d, new_age_level:%d\n",
+                                di->age_voltage, di->age_ocv_cap,
+                                ocv_soc, age_level, di->age_allow_update,
+                                di->age_level);
                }
        }
 }
 
-
-static int _get_soc(struct   battery_info *di)
-{
-       return di->remain_capacity * 100 / div(di->fcc);
-}
-
-static enum power_supply_property rk_battery_props[] = {
-       POWER_SUPPLY_PROP_STATUS,
+static enum power_supply_property rk818_bat_props[] = {
        POWER_SUPPLY_PROP_CURRENT_NOW,
        POWER_SUPPLY_PROP_VOLTAGE_NOW,
        POWER_SUPPLY_PROP_PRESENT,
        POWER_SUPPLY_PROP_HEALTH,
        POWER_SUPPLY_PROP_CAPACITY,
+       POWER_SUPPLY_PROP_TEMP,
+       POWER_SUPPLY_PROP_STATUS,
 };
 
-#define to_device_info(x) container_of((x), \
-                               struct battery_info, bat)
-
-static int rk81x_battery_get_property(struct power_supply *psy,
+static int rk818_battery_get_property(struct power_supply *psy,
                                      enum power_supply_property psp,
                                      union power_supply_propval *val)
 {
-       struct battery_info *di = to_device_info(psy);
+       struct rk818_battery *di = power_supply_get_drvdata(psy);
 
        switch (psp) {
        case POWER_SUPPLY_PROP_CURRENT_NOW:
-               val->intval = di->current_avg*1000;/*uA*/
-               if (di->fg_drv_mode == TEST_POWER_MODE)
-                       val->intval = TEST_CURRENT*1000;
+               val->intval = di->current_avg * 1000;/*uA*/
+               if (di->pdata->bat_mode == MODE_VIRTUAL)
+                       val->intval = VIRTUAL_CURRENT * 1000;
                break;
-
        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-               val->intval = di->voltage*1000;/*uV*/
-               if (di->fg_drv_mode == TEST_POWER_MODE)
-                       val->intval = TEST_VOLTAGE*1000;
-
+               val->intval = di->voltage_avg * 1000;/*uV*/
+               if (di->pdata->bat_mode == MODE_VIRTUAL)
+                       val->intval = VIRTUAL_VOLTAGE * 1000;
                break;
-
        case POWER_SUPPLY_PROP_PRESENT:
-               val->intval = is_rk81x_bat_exist(di);
-               if (di->fg_drv_mode == TEST_POWER_MODE)
-                       val->intval = TEST_PRESET;
-
+               val->intval = is_rk818_bat_exist(di);
+               if (di->pdata->bat_mode == MODE_VIRTUAL)
+                       val->intval = VIRTUAL_PRESET;
                break;
-
        case POWER_SUPPLY_PROP_CAPACITY:
-               val->intval = di->real_soc;
-               if (di->fg_drv_mode == TEST_POWER_MODE)
-                       val->intval = TEST_SOC;
-
-               DBG("<%s>, report dsoc: %d\n", __func__, val->intval);
+               val->intval = di->dsoc;
+               if (di->pdata->bat_mode == MODE_VIRTUAL)
+                       val->intval = VIRTUAL_SOC;
+               DBG("<%s>. report dsoc: %d\n", __func__, val->intval);
                break;
-
        case POWER_SUPPLY_PROP_HEALTH:
                val->intval = POWER_SUPPLY_HEALTH_GOOD;
                break;
-
+       case POWER_SUPPLY_PROP_TEMP:
+               val->intval = di->temperature;
+               if (di->pdata->bat_mode == MODE_VIRTUAL)
+                       val->intval = VIRTUAL_TEMPERATURE;
+               break;
        case POWER_SUPPLY_PROP_STATUS:
-               val->intval = di->status;
-               if (di->fg_drv_mode == TEST_POWER_MODE)
-                       val->intval = TEST_STATUS;
-
+               if (di->pdata->bat_mode == MODE_VIRTUAL)
+                       val->intval = VIRTUAL_STATUS;
+               else if (di->dsoc == 100)
+                       val->intval = POWER_SUPPLY_STATUS_FULL;
+               else if (rk818_bat_chrg_online(di))
+                       val->intval = POWER_SUPPLY_STATUS_CHARGING;
+               else
+                       val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
                break;
-
        default:
                return -EINVAL;
        }
@@ -1358,2641 +911,2389 @@ static int rk81x_battery_get_property(struct power_supply *psy,
        return 0;
 }
 
-
-static enum power_supply_property rk_battery_ac_props[] = {
-       POWER_SUPPLY_PROP_ONLINE,
+static const struct power_supply_desc rk818_bat_desc = {
+       .name           = "battery",
+       .type           = POWER_SUPPLY_TYPE_BATTERY,
+       .properties     = rk818_bat_props,
+       .num_properties = ARRAY_SIZE(rk818_bat_props),
+       .get_property   = rk818_battery_get_property,
 };
-static enum power_supply_property rk_battery_usb_props[] = {
-       POWER_SUPPLY_PROP_ONLINE,
-};
-
 
-#define to_ac_device_info(x) container_of((x), \
-                               struct battery_info, ac)
-
-static int rk81x_battery_ac_get_property(struct power_supply *psy,
-                                        enum power_supply_property psp,
-                                        union power_supply_propval *val)
+static int rk818_bat_init_power_supply(struct rk818_battery *di)
 {
-       int ret = 0;
-       struct battery_info *di = to_ac_device_info(psy);
-
-       switch (psp) {
-       case POWER_SUPPLY_PROP_ONLINE:
-               val->intval = di->ac_online;    /*discharging*/
-               if (di->fg_drv_mode == TEST_POWER_MODE)
-                       val->intval = TEST_AC_ONLINE;
-
-               break;
+       struct power_supply_config psy_cfg = { .drv_data = di, };
 
-       default:
-               ret = -EINVAL;
-               break;
+       di->bat = devm_power_supply_register(di->dev, &rk818_bat_desc, &psy_cfg);
+       if (IS_ERR(di->bat)) {
+               dev_err(di->dev, "register bat power supply fail\n");
+               return PTR_ERR(di->bat);
        }
-       return ret;
-}
 
-#define to_usb_device_info(x) container_of((x), \
-                               struct battery_info, usb)
+       return 0;
+}
 
-static int rk81x_battery_usb_get_property(struct power_supply *psy,
-                                         enum power_supply_property psp,
-                                         union power_supply_propval *val)
+static void rk818_bat_save_cap(struct rk818_battery *di, int cap)
 {
-       int ret = 0;
-       struct battery_info *di = to_usb_device_info(psy);
-
-       switch (psp) {
-       case POWER_SUPPLY_PROP_ONLINE:
-               if ((strstr(saved_command_line, "charger") == NULL) &&
-                   (di->real_soc == 0) && (di->work_on == 1))
-                       val->intval = 0;
-               else
-                       val->intval = di->usb_online;
-
-               if (di->fg_drv_mode == TEST_POWER_MODE)
-                       val->intval = TEST_USB_ONLINE;
-               break;
+       u8 buf;
+       static u32 old_cap;
 
-       default:
-               ret = -EINVAL;
-               break;
-       }
+       if (cap >= di->qmax)
+               cap = di->qmax;
+       if (cap <= 0)
+               cap = 0;
+       if (old_cap == cap)
+               return;
 
-       return ret;
+       old_cap = cap;
+       buf = (cap >> 24) & 0xff;
+       rk818_bat_write(di, RK818_REMAIN_CAP_REG3, buf);
+       buf = (cap >> 16) & 0xff;
+       rk818_bat_write(di, RK818_REMAIN_CAP_REG2, buf);
+       buf = (cap >> 8) & 0xff;
+       rk818_bat_write(di, RK818_REMAIN_CAP_REG1, buf);
+       buf = (cap >> 0) & 0xff;
+       rk818_bat_write(di, RK818_REMAIN_CAP_REG0, buf);
 }
 
-
-static void battery_power_supply_init(struct battery_info *di)
+static int rk818_bat_get_prev_cap(struct rk818_battery *di)
 {
-       di->bat.name = "BATTERY";
-       di->bat.type = POWER_SUPPLY_TYPE_BATTERY;
-       di->bat.properties = rk_battery_props;
-       di->bat.num_properties = ARRAY_SIZE(rk_battery_props);
-       di->bat.get_property = rk81x_battery_get_property;
+       int val = 0;
 
-       di->ac.name = "AC";
-       di->ac.type = POWER_SUPPLY_TYPE_MAINS;
-       di->ac.properties = rk_battery_ac_props;
-       di->ac.num_properties = ARRAY_SIZE(rk_battery_ac_props);
-       di->ac.get_property = rk81x_battery_ac_get_property;
+       val |= rk818_bat_read(di, RK818_REMAIN_CAP_REG3) << 24;
+       val |= rk818_bat_read(di, RK818_REMAIN_CAP_REG2) << 16;
+       val |= rk818_bat_read(di, RK818_REMAIN_CAP_REG1) << 8;
+       val |= rk818_bat_read(di, RK818_REMAIN_CAP_REG0) << 0;
 
-       di->usb.name = "USB";
-       di->usb.type = POWER_SUPPLY_TYPE_USB;
-       di->usb.properties = rk_battery_usb_props;
-       di->usb.num_properties = ARRAY_SIZE(rk_battery_usb_props);
-       di->usb.get_property = rk81x_battery_usb_get_property;
+       return val;
 }
 
-static int battery_power_supply_register(struct battery_info *di)
+static void rk818_bat_save_fcc(struct rk818_battery *di, u32 fcc)
 {
-       int ret;
-       struct device *dev = di->dev;
-
-       ret = power_supply_register(dev, &di->bat);
-       if (ret) {
-               dev_err(dev, "failed to register main battery\n");
-               goto batt_failed;
-       }
-       ret = power_supply_register(dev, &di->usb);
-       if (ret) {
-               dev_err(dev, "failed to register usb power supply\n");
-               goto usb_failed;
-       }
-       ret = power_supply_register(dev, &di->ac);
-       if (ret) {
-               dev_err(dev, "failed to register ac power supply\n");
-               goto ac_failed;
-       }
-
-       return 0;
+       u8 buf;
 
-ac_failed:
-       power_supply_unregister(&di->ac);
-usb_failed:
-       power_supply_unregister(&di->usb);
-batt_failed:
-       power_supply_unregister(&di->bat);
+       buf = (fcc >> 24) & 0xff;
+       rk818_bat_write(di, RK818_NEW_FCC_REG3, buf);
+       buf = (fcc >> 16) & 0xff;
+       rk818_bat_write(di, RK818_NEW_FCC_REG2, buf);
+       buf = (fcc >> 8) & 0xff;
+       rk818_bat_write(di, RK818_NEW_FCC_REG1, buf);
+       buf = (fcc >> 0) & 0xff;
+       rk818_bat_write(di, RK818_NEW_FCC_REG0, buf);
 
-       return ret;
+       BAT_INFO("save fcc: %d\n", fcc);
 }
 
-static void  _capacity_init(struct battery_info *di, u32 capacity)
+static int rk818_bat_get_fcc(struct rk818_battery *di)
 {
-       u8 buf;
-       u32 capacity_ma;
-       int delta_cap;
-
-       delta_cap = capacity - di->remain_capacity;
-       di->adjust_cap += delta_cap;
+       u32 fcc = 0;
 
-       reset_zero_var(di);
+       fcc |= rk818_bat_read(di, RK818_NEW_FCC_REG3) << 24;
+       fcc |= rk818_bat_read(di, RK818_NEW_FCC_REG2) << 16;
+       fcc |= rk818_bat_read(di, RK818_NEW_FCC_REG1) << 8;
+       fcc |= rk818_bat_read(di, RK818_NEW_FCC_REG0) << 0;
 
-       capacity_ma = capacity*2390;/* 2134;//36*14/900*4096/521*500; */
-       do {
-               buf = (capacity_ma>>24)&0xff;
-               battery_write(di->rk818, GASCNT_CAL_REG3, &buf, 1);
-               buf = (capacity_ma>>16)&0xff;
-               battery_write(di->rk818, GASCNT_CAL_REG2, &buf, 1);
-               buf = (capacity_ma>>8)&0xff;
-               battery_write(di->rk818, GASCNT_CAL_REG1, &buf, 1);
-               buf = (capacity_ma&0xff) | 0x01;
-               battery_write(di->rk818, GASCNT_CAL_REG0, &buf, 1);
-               battery_read(di->rk818, GASCNT_CAL_REG0, &buf, 1);
+       if (fcc < MIN_FCC) {
+               BAT_INFO("invalid fcc(%d), use design cap", fcc);
+               fcc = di->pdata->design_capacity;
+               rk818_bat_save_fcc(di, fcc);
+       } else if (fcc > di->pdata->design_qmax) {
+               BAT_INFO("invalid fcc(%d), use qmax", fcc);
+               fcc = di->pdata->design_qmax;
+               rk818_bat_save_fcc(di, fcc);
+       }
 
-       } while (buf == 0);
+       return fcc;
 }
 
-
-static void  _save_remain_capacity(struct battery_info *di, u32 capacity)
+static void rk818_bat_init_coulomb_cap(struct rk818_battery *di, u32 capacity)
 {
        u8 buf;
-       u32 capacity_ma;
-
-       if (capacity >= di->qmax)
-               capacity = di->qmax;
+       u32 cap;
 
-       if (capacity <= 0)
-               capacity = 0;
+       cap = capacity * 2390 / DIV(di->res_div);
+       buf = (cap >> 24) & 0xff;
+       rk818_bat_write(di, RK818_GASCNT_CAL_REG3, buf);
+       buf = (cap >> 16) & 0xff;
+       rk818_bat_write(di, RK818_GASCNT_CAL_REG2, buf);
+       buf = (cap >> 8) & 0xff;
+       rk818_bat_write(di, RK818_GASCNT_CAL_REG1, buf);
+       buf = ((cap >> 0) & 0xff);
+       rk818_bat_write(di, RK818_GASCNT_CAL_REG0, buf);
 
-       capacity_ma = capacity;
-
-       buf = (capacity_ma>>24)&0xff;
-       battery_write(di->rk818, REMAIN_CAP_REG3, &buf, 1);
-       buf = (capacity_ma>>16)&0xff;
-       battery_write(di->rk818, REMAIN_CAP_REG2, &buf, 1);
-       buf = (capacity_ma>>8)&0xff;
-       battery_write(di->rk818, REMAIN_CAP_REG1, &buf, 1);
-       buf = (capacity_ma&0xff) | 0x01;
-       battery_write(di->rk818, REMAIN_CAP_REG0, &buf, 1);
+       DBG("<%s>. new coulomb cap = %d\n", __func__, capacity);
+       di->remain_cap = capacity;
+       di->rsoc = rk818_bat_get_rsoc(di);
 }
 
-static int _get_remain_capacity(struct battery_info *di)
+static void rk818_bat_save_dsoc(struct rk818_battery *di, u8 save_soc)
 {
-       int ret;
-       u8 buf;
-       u32 capacity;
-       int i;
-       int val[3];
+       static int last_soc = -1;
 
-       for (i = 0; i < 3; i++) {
-               ret = battery_read(di->rk818, REMAIN_CAP_REG3, &buf, 1);
-               val[i] = buf << 24;
-               ret = battery_read(di->rk818, REMAIN_CAP_REG2, &buf, 1);
-               val[i] |= buf << 16;
-               ret = battery_read(di->rk818, REMAIN_CAP_REG1, &buf, 1);
-               val[i] |= buf << 8;
-               ret = battery_read(di->rk818, REMAIN_CAP_REG0, &buf, 1);
-               val[i] |= buf;
+       if (last_soc != save_soc) {
+               rk818_bat_write(di, RK818_SOC_REG, save_soc);
+               last_soc = save_soc;
        }
-
-       if (val[0] == val[1])
-               capacity = val[0];
-       else
-               capacity = val[2];
-
-       return capacity;
 }
 
-
-static void  _save_FCC_capacity(struct battery_info *di, u32 capacity)
+static int rk818_bat_get_prev_dsoc(struct rk818_battery *di)
 {
-       u8 buf;
-       u32 capacity_ma;
-
-       capacity_ma = capacity;
-       buf = (capacity_ma>>24)&0xff;
-       battery_write(di->rk818, NEW_FCC_REG3, &buf, 1);
-       buf = (capacity_ma>>16)&0xff;
-       battery_write(di->rk818, NEW_FCC_REG2, &buf, 1);
-       buf = (capacity_ma>>8)&0xff;
-       battery_write(di->rk818, NEW_FCC_REG1, &buf, 1);
-       buf = (capacity_ma&0xff) | 0x01;
-       battery_write(di->rk818, NEW_FCC_REG0, &buf, 1);
+       return rk818_bat_read(di, RK818_SOC_REG);
 }
 
-static int _get_FCC_capacity(struct battery_info *di)
+static void rk818_bat_save_reboot_cnt(struct rk818_battery *di, u8 save_cnt)
 {
-       int ret;
-       int temp = 0;
-       u8 buf;
-       u32 capacity;
-
-       ret = battery_read(di->rk818, NEW_FCC_REG3, &buf, 1);
-       temp = buf << 24;
-       ret = battery_read(di->rk818, NEW_FCC_REG2, &buf, 1);
-       temp |= buf << 16;
-       ret = battery_read(di->rk818, NEW_FCC_REG1, &buf, 1);
-       temp |= buf << 8;
-       ret = battery_read(di->rk818, NEW_FCC_REG0, &buf, 1);
-       temp |= buf;
-
-       if (temp > 1)
-               capacity = temp-1;/* 4096*900/14/36*500/521 */
-       else
-               capacity = temp;
-       DBG("%s NEW_FCC_REG %d  capacity = %d\n", __func__, temp, capacity);
-
-       return capacity;
+       rk818_bat_write(di, RK818_REBOOT_CNT_REG, save_cnt);
 }
 
-static int _get_realtime_capacity(struct battery_info *di)
+static int rk818_bat_fb_notifier(struct notifier_block *nb,
+                                unsigned long event, void *data)
 {
-       int ret;
-       int temp = 0;
-       u8 buf;
-       u32 capacity;
-       int i;
-       int val[3];
-
-       for (i = 0; i < 3; i++) {
-               ret = battery_read(di->rk818, GASCNT3, &buf, 1);
-               val[i] = buf << 24;
-               ret = battery_read(di->rk818, GASCNT2, &buf, 1);
-               val[i] |= buf << 16;
-               ret = battery_read(di->rk818, GASCNT1, &buf, 1);
-               val[i] |= buf << 8;
-               ret = battery_read(di->rk818, GASCNT0, &buf, 1);
-               val[i] |= buf;
-       }
-       if (val[0] == val[1])
-               temp = val[0];
-       else
-               temp = val[2];
+       struct rk818_battery *di;
+       struct fb_event *evdata = data;
 
-       capacity = temp/2390;/* 4096*900/14/36*500/521; */
+       if (event != FB_EARLY_EVENT_BLANK && event != FB_EVENT_BLANK)
+               return NOTIFY_OK;
 
-       return capacity;
-}
+       di = container_of(nb, struct rk818_battery, fb_nb);
+       di->fb_blank = *(int *)evdata->data;
 
-static int _copy_soc(struct  battery_info *di, u8 save_soc)
-{
-       u8 soc;
-
-       soc = save_soc;
-       battery_write(di->rk818, SOC_REG, &soc, 1);
        return 0;
 }
 
-static int copy_reboot_cnt(struct  battery_info *di, u8 save_cnt)
+static int rk818_bat_register_fb_notify(struct rk818_battery *di)
 {
-       u8 cnt;
+       memset(&di->fb_nb, 0, sizeof(di->fb_nb));
+       di->fb_nb.notifier_call = rk818_bat_fb_notifier;
 
-       cnt = save_cnt;
-       battery_write(di->rk818, REBOOT_CNT_REG, &cnt, 1);
-       return 0;
+       return fb_register_client(&di->fb_nb);
 }
 
-static bool support_uboot_charge(void)
+static int rk818_bat_unregister_fb_notify(struct rk818_battery *di)
 {
-       return support_uboot_chrg ? true : false;
+       return fb_unregister_client(&di->fb_nb);
 }
 
-
-/*
-* There are three ways to detect dc_adp:
-*      1. hardware only support dc_adp: by reg VB_MOD_REG of rk818,
-*         do not care about whether define dc_det_pin or not;
-*      2. define de_det_pin: check gpio level;
-*      3. support usb_adp and dc_adp: by VB_MOD_REG and usb interface.
-*         case that: gpio invalid or not define.
-*/
-static enum charger_type_t rk81x_get_dc_state(struct battery_info *di)
-{
-       enum charger_type_t charger_type;
-       u8 buf;
-       int ret;
-
-       battery_read(di->rk818, VB_MOD_REG, &buf, 1);
-
-       /*only HW_ADP_TYPE_DC: det by rk818 is easily and will be successful*/
-        if (!rk81x_support_adp_type(HW_ADP_TYPE_USB)) {
-               if ((buf & PLUG_IN_STS) != 0)
-                       charger_type = DC_CHARGER;
-               else
-                       charger_type = NO_CHARGER;
-
-               return charger_type;
-        }
-
-#if 1
-       /*det by gpio level*/
-       if (gpio_is_valid(di->dc_det_pin)) {
-               ret = gpio_request(di->dc_det_pin, "rk818_dc_det");
-               if (ret < 0) {
-                       pr_err("Failed to request gpio %d with ret:""%d\n",
-                              di->dc_det_pin, ret);
-                       return NO_CHARGER;
-               }
-
-               gpio_direction_input(di->dc_det_pin);
-               ret = gpio_get_value(di->dc_det_pin);
-               if (ret == di->dc_det_level)
-                       charger_type = DC_CHARGER;
-               else
-                       charger_type = NO_CHARGER;
-
-               gpio_free(di->dc_det_pin);
-               DBG("**********rk818 dc_det_pin=%d\n", ret);
-
-               return charger_type;
-       }
-#endif
-       /*HW_ADP_TYPE_DUAL: det by rk818 and usb*/
-       else if (rk81x_support_adp_type(HW_ADP_TYPE_DUAL)) {
-               if ((buf & PLUG_IN_STS) != 0) {
-                       charger_type = dwc_otg_check_dpdm();
-                       if (charger_type == 0)
-                               charger_type = DC_CHARGER;
-                       else
-                               charger_type = NO_CHARGER;
-               }
-       }
-
-       return charger_type;
+static u8 rk818_bat_get_halt_cnt(struct rk818_battery *di)
+{
+       return rk818_bat_read(di, RK818_HALT_CNT_REG);
 }
 
-static enum charger_type_t rk81x_get_usbac_state(struct battery_info *di)
+static void rk818_bat_inc_halt_cnt(struct rk818_battery *di)
 {
-       enum charger_type_t charger_type;
-       int usb_id, gadget_flag;
-
-       usb_id = dwc_otg_check_dpdm();
-       switch (usb_id) {
-       case 0:
-               charger_type = NO_CHARGER;
-               break;
-       case 1:
-       case 3:
-               charger_type = USB_CHARGER;
-               break;
-       case 2:
-               charger_type = AC_CHARGER;
-               break;
-       default:
-               charger_type = NO_CHARGER;
-       }
-
-       DBG("<%s>. DWC_OTG = %d\n", __func__, usb_id);
-       if (charger_type == USB_CHARGER) {
-               gadget_flag = get_gadget_connect_flag();
-               DBG("<%s>. gadget_flag=%d, check_cnt=%d\n",
-                   __func__, gadget_flag, di->check_count);
-
-               if (0 == gadget_flag) {
-                       if (++di->check_count >= 5) {
-                               charger_type = AC_CHARGER;
-                               DBG("<%s>. turn to AC_CHARGER, check_cnt=%d\n",
-                                   __func__, di->check_count);
-                       } else {
-                               charger_type = USB_CHARGER;
-                       }
-               } else {
-                       charger_type = USB_CHARGER;
-               }
-       } else {
-               di->check_count = 0;
-       }
+       u8 cnt;
 
-       return charger_type;
+       cnt = rk818_bat_read(di, RK818_HALT_CNT_REG);
+       rk818_bat_write(di, RK818_HALT_CNT_REG, ++cnt);
 }
 
-/*
- * it is first time for battery to be weld, init by ocv table
- */
-static void rsoc_first_poweron_init(struct battery_info *di)
+static bool is_rk818_bat_last_halt(struct rk818_battery *di)
 {
-       _save_FCC_capacity(di, di->design_capacity);
-       di->fcc = _get_FCC_capacity(di);
+       int pre_cap = rk818_bat_get_prev_cap(di);
+       int now_cap = rk818_bat_get_coulomb_cap(di);
 
-       di->temp_soc = _voltage_to_capacity(di, di->voltage_ocv);
-       di->real_soc = di->temp_soc;
-       di->nac      = di->temp_nac;
-       di->first_on_cap = di->nac;
-
-       rk81x_set_bit(di, MISC_MARK_REG, OCV_VALID_SHIFT);
-       rk81x_set_bit(di, MISC_MARK_REG, FIRST_PWRON_SHIFT);/*save*/
-       DBG("<%s>.this is first poweron: OCV-SOC:%d, OCV-CAP:%d, FCC:%d\n",
-           __func__, di->real_soc, di->nac, di->fcc);
+       /* over 10%: system halt last time */
+       if (abs(now_cap - pre_cap) > (di->fcc / 10)) {
+               rk818_bat_inc_halt_cnt(di);
+               return true;
+       } else {
+               return false;
+       }
 }
 
-/*
- * it is not first time for battery to be weld, init by last record info
- */
-static void rsoc_not_first_poweron_init(struct battery_info *di)
-{
-       u8 pwron_soc;
-       u8 init_soc;
-       u8 last_shtd_time;
-       u8 curr_shtd_time;
-       int remain_capacity;
-       int ocv_soc;
-       enum charger_type_t charger_type;
-
-       rk81x_clr_bit(di, MISC_MARK_REG, FIRST_PWRON_SHIFT);
-       battery_read(di->rk818, SOC_REG, &pwron_soc, 1);
-       init_soc = pwron_soc;
-       DBG("<%s> Not first pwron, SOC_REG = %d\n", __func__, pwron_soc);
-
-       if (rk81x_support_adp_type(HW_ADP_TYPE_USB)) {
-               charger_type = rk81x_get_usbac_state(di);
-               if ((pwron_soc == 0) && (charger_type == USB_CHARGER)) {
-                       init_soc = 1;
-                       battery_write(di->rk818, SOC_REG, &init_soc, 1);
+static void rk818_bat_first_pwron(struct rk818_battery *di)
+{
+       int ocv_vol;
+
+       rk818_bat_save_fcc(di, di->design_cap);
+       ocv_vol = rk818_bat_get_ocv_voltage(di);
+       di->fcc = rk818_bat_get_fcc(di);
+       di->nac = rk818_bat_vol_to_ocvcap(di, ocv_vol);
+       di->rsoc = rk818_bat_vol_to_ocvsoc(di, ocv_vol);
+       di->dsoc = di->rsoc;
+       di->is_first_on = true;
+
+       BAT_INFO("first on: dsoc=%d, rsoc=%d cap=%d, fcc=%d, ov=%d\n",
+                di->dsoc, di->rsoc, di->nac, di->fcc, ocv_vol);
+}
+
+static void rk818_bat_not_first_pwron(struct rk818_battery *di)
+{
+       int now_cap, pre_soc, pre_cap, ocv_cap, ocv_soc, ocv_vol;
+
+       di->fcc = rk818_bat_get_fcc(di);
+       pre_soc = rk818_bat_get_prev_dsoc(di);
+       pre_cap = rk818_bat_get_prev_cap(di);
+       now_cap = rk818_bat_get_coulomb_cap(di);
+       di->is_halt = is_rk818_bat_last_halt(di);
+       di->halt_cnt = rk818_bat_get_halt_cnt(di);
+       di->is_initialized = is_rk818_bat_initialized(di);
+       di->is_ocv_calib = is_rk818_bat_ocv_valid(di);
+
+       if (di->is_halt) {
+               BAT_INFO("system halt last time... cap: pre=%d, now=%d\n",
+                        pre_cap, now_cap);
+               if (now_cap < 0)
+                       now_cap = 0;
+               rk818_bat_init_coulomb_cap(di, now_cap);
+               pre_cap = now_cap;
+               pre_soc = di->rsoc;
+               goto finish;
+       } else if (di->is_initialized) {
+               BAT_INFO("initialized yet..\n");
+               goto finish;
+       } else if (di->is_ocv_calib) {
+               ocv_vol = rk818_bat_get_ocv_voltage(di);
+               ocv_soc = rk818_bat_vol_to_ocvsoc(di, ocv_vol);
+               ocv_cap = rk818_bat_vol_to_ocvcap(di, ocv_vol);
+               pre_cap = ocv_cap;
+               di->ocv_pre_dsoc = pre_soc;
+               di->ocv_new_dsoc = ocv_soc;
+               if (abs(ocv_soc - pre_soc) >= di->pdata->max_soc_offset) {
+                       di->ocv_pre_dsoc = pre_soc;
+                       di->ocv_new_dsoc = ocv_soc;
+                       di->is_max_soc_offset = true;
+                       BAT_INFO("trigger max soc offset, dsoc: %d -> %d\n",
+                                pre_soc, ocv_soc);
+                       pre_soc = ocv_soc;
                }
-       }
-
-       remain_capacity = _get_remain_capacity(di);
-       /* check if support uboot charge,
-        * if support, uboot charge driver should have done init work,
-        * so here we should skip init work
-        */
-       if (support_uboot_charge())
-               goto out;
-
-       battery_read(di->rk818, NON_ACT_TIMER_CNT_REG,
-                    &curr_shtd_time, 1);
-       battery_read(di->rk818, NON_ACT_TIMER_CNT_REG_SAVE,
-                    &last_shtd_time, 1);
-       battery_write(di->rk818, NON_ACT_TIMER_CNT_REG_SAVE,
-                     &curr_shtd_time, 1);
-       DBG("<%s>, now_shtd_time = %d, last_shtd_time = %d, otg_status = %d\n",
-           __func__, curr_shtd_time, last_shtd_time, charger_type);
-
-       ocv_soc = _voltage_to_capacity(di, di->voltage_ocv);
-       DBG("<%s>, Not first pwron, real_remain_cap = %d, ocv-remain_cp=%d\n",
-           __func__, remain_capacity, di->temp_nac);
-
-       /* if plugin, make sure current shtd_time diff from last_shtd_time.*/
-       if (last_shtd_time != curr_shtd_time) {
-               if (curr_shtd_time > 30) {
-                       rk81x_set_bit(di, MISC_MARK_REG, OCV_VALID_SHIFT);
-
-                       remain_capacity = di->temp_nac;
-                       di->first_on_cap = remain_capacity;
-                       DBG("<%s>pwroff > 30 minute, remain_cap = %d\n",
-                           __func__, remain_capacity);
-
-               } else if ((curr_shtd_time > 5) &&
-                               (abs32_int(ocv_soc - init_soc) >= 10)) {
-                       if (remain_capacity >= di->temp_nac*120/100)
-                               remain_capacity = di->temp_nac*110/100;
-                       else if (remain_capacity < di->temp_nac*8/10)
-                               remain_capacity = di->temp_nac*9/10;
-                       DBG("<%s> pwroff > 3 minute, remain_cap = %d\n",
-                           __func__, remain_capacity);
+               BAT_INFO("OCV calib: cap=%d, rsoc=%d\n", ocv_cap, ocv_soc);
+       } else if (di->pwroff_min > 0) {
+               ocv_vol = rk818_bat_get_ocv_voltage(di);
+               ocv_soc = rk818_bat_vol_to_ocvsoc(di, ocv_vol);
+               ocv_cap = rk818_bat_vol_to_ocvcap(di, ocv_vol);
+               di->force_pre_dsoc = pre_soc;
+               di->force_new_dsoc = ocv_soc;
+               if (abs(ocv_soc - pre_soc) >= 80) {
+                       di->is_force_calib = true;
+                       BAT_INFO("dsoc force calib: %d -> %d\n",
+                                pre_soc, ocv_soc);
+                       pre_soc = ocv_soc;
+                       pre_cap = ocv_cap;
                }
-       } else {
-               rk81x_clr_bit(di, MISC_MARK_REG, OCV_VALID_SHIFT);
        }
-out:
-       di->real_soc = init_soc;
-       di->nac = remain_capacity;
-       if (di->nac <= 0)
-               di->nac = 0;
-       DBG("<%s> init_soc = %d, init_capacity=%d\n",
-           __func__, di->real_soc, di->nac);
-}
-
-static u8 get_sys_pwroff_min(struct battery_info *di)
-{
-       u8 curr_shtd_time, last_shtd_time;
 
-       battery_read(di->rk818, NON_ACT_TIMER_CNT_REG,
-                    &curr_shtd_time, 1);
-       battery_read(di->rk818, NON_ACT_TIMER_CNT_REG_SAVE,
-                    &last_shtd_time, 1);
+finish:
+       di->dsoc = pre_soc;
+       di->nac = pre_cap;
+       if (di->nac < 0)
+               di->nac = 0;
 
-       return (curr_shtd_time != last_shtd_time) ? curr_shtd_time : 0;
+       BAT_INFO("dsoc=%d cap=%d v=%d ov=%d rv=%d min=%d psoc=%d pcap=%d\n",
+                di->dsoc, di->nac, rk818_bat_get_avg_voltage(di),
+                rk818_bat_get_ocv_voltage(di), rk818_bat_get_relax_voltage(di),
+                di->pwroff_min, rk818_bat_get_prev_dsoc(di),
+                rk818_bat_get_prev_cap(di));
 }
 
-static int _rsoc_init(struct battery_info *di)
+static bool rk818_bat_ocv_sw_reset(struct rk818_battery *di)
 {
-       u8 pwroff_min;
-       u8 calib_en;/*debug*/
-
-       di->voltage  = _get_battery_voltage(di);
-       di->voltage_ocv = _get_OCV_voltage(di);
-       pwroff_min = get_sys_pwroff_min(di);
-
-       DBG("OCV voltage=%d, voltage=%d, pwroff_min=%d\n",
-           di->voltage_ocv, di->voltage, pwroff_min);
-
-       calib_en = rk81x_read_bit(di, MISC_MARK_REG, OCV_CALIB_SHIFT);
-       DBG("readbit: calib_en=%d\n", calib_en);
-       if (_is_first_poweron(di) ||
-           ((pwroff_min >= 30) && (calib_en == 1))) {
-               rsoc_first_poweron_init(di);
-               rk81x_clr_bit(di, MISC_MARK_REG, OCV_CALIB_SHIFT);
+       u8 buf;
 
+       buf = rk818_bat_read(di, RK818_MISC_MARK_REG);
+       if (((buf & FG_RESET_LATE) && di->pwroff_min >= 30) ||
+           (buf & FG_RESET_NOW)) {
+               buf &= ~FG_RESET_LATE;
+               buf &= ~FG_RESET_NOW;
+               rk818_bat_write(di, RK818_MISC_MARK_REG, buf);
+               BAT_INFO("manual reset fuel gauge\n");
+               return true;
        } else {
-               rsoc_not_first_poweron_init(di);
+               return false;
        }
-
-       return 0;
 }
 
+static void rk818_bat_init_rsoc(struct rk818_battery *di)
+{
+       di->is_first_power_on = is_rk818_bat_first_pwron(di);
+       di->is_sw_reset = rk818_bat_ocv_sw_reset(di);
+       di->pwroff_min = rk818_bat_get_pwroff_min(di);
+
+       if (di->is_first_power_on || di->is_sw_reset)
+               rk818_bat_first_pwron(di);
+       else
+               rk818_bat_not_first_pwron(di);
+}
 
-static u8 rk81x_get_charge_status(struct battery_info *di)
+static u8 rk818_bat_get_chrg_status(struct rk818_battery *di)
 {
        u8 status;
-       u8 ret = 0;
 
-       battery_read(di->rk818, SUP_STS_REG, &status, 1);
-       status &= (0x70);
+       status = rk818_bat_read(di, RK818_SUP_STS_REG) & CHRG_STATUS_MSK;
        switch (status) {
        case CHARGE_OFF:
-               ret = CHARGE_OFF;
-               DBG("  CHARGE-OFF ...\n");
+               DBG("CHARGE-OFF ...\n");
                break;
-
        case DEAD_CHARGE:
-               ret = DEAD_CHARGE;
-               DBG("  DEAD CHARGE ...\n");
+               BAT_INFO("DEAD CHARGE...\n");
                break;
-
-       case  TRICKLE_CHARGE:
-               ret = DEAD_CHARGE;
-               DBG("  TRICKLE CHARGE ...\n ");
+       case TRICKLE_CHARGE:
+               BAT_INFO("TRICKLE CHARGE...\n ");
                break;
-
-       case  CC_OR_CV:
-               ret = CC_OR_CV;
-               DBG("  CC or CV ...\n");
+       case CC_OR_CV:
+               DBG("CC or CV...\n");
                break;
-
-       case  CHARGE_FINISH:
-               ret = CHARGE_FINISH;
-               DBG("  CHARGE FINISH ...\n");
+       case CHARGE_FINISH:
+               DBG("CHARGE FINISH...\n");
                break;
-
-       case  USB_OVER_VOL:
-               ret = USB_OVER_VOL;
-               DBG("  USB OVER VOL ...\n");
+       case USB_OVER_VOL:
+               BAT_INFO("USB OVER VOL...\n");
                break;
-
-       case  BAT_TMP_ERR:
-               ret = BAT_TMP_ERR;
-               DBG("  BAT TMP ERROR ...\n");
+       case BAT_TMP_ERR:
+               BAT_INFO("BAT TMP ERROR...\n");
                break;
-
-       case  TIMER_ERR:
-               ret = TIMER_ERR;
-               DBG("  TIMER ERROR ...\n");
+       case TIMER_ERR:
+               BAT_INFO("TIMER ERROR...\n");
                break;
-
-       case  USB_EXIST:
-               ret = USB_EXIST;
-               DBG("  USB EXIST ...\n");
+       case USB_EXIST:
+               BAT_INFO("USB EXIST...\n");
                break;
-
-       case  USB_EFF:
-               ret = USB_EFF;
-               DBG("  USB EFF...\n");
+       case USB_EFF:
+               BAT_INFO("USB EFF...\n");
                break;
-
        default:
                return -EINVAL;
        }
 
-       return ret;
+       return status;
 }
 
-static void set_charge_current(struct battery_info *di, int charge_current)
+static u8 rk818_bat_parse_fb_temperature(struct rk818_battery *di)
 {
-       u8 usb_ctrl_reg;
-
-       battery_read(di->rk818, USB_CTRL_REG, &usb_ctrl_reg, 1);
-       usb_ctrl_reg &= (~0x0f);/* (VLIM_4400MV | ILIM_1200MA) |(0x01 << 7); */
-       usb_ctrl_reg |= (charge_current | CHRG_CT_EN);
-       battery_write(di->rk818, USB_CTRL_REG, &usb_ctrl_reg, 1);
-}
+       u8 reg;
+       int index, fb_temp;
 
-static void rk81x_fg_match_param(struct battery_info *di, int chg_vol,
-                                int chg_ilim, int chg_cur)
-{
-       int i;
-
-       di->chg_v_lmt = DEF_CHRG_VOL;
-       di->chg_i_lmt = DEF_CHRG_CURR_LMT;
-       di->chg_i_cur = DEF_CHRG_CURR_SEL;
-
-       for (i = 0; i < ARRAY_SIZE(CHG_V_LMT); i++) {
-               if (chg_vol < CHG_V_LMT[i])
+       reg = DEFAULT_FB_TEMP;
+       fb_temp = di->pdata->fb_temp;
+       for (index = 0; index < ARRAY_SIZE(feedback_temp_array); index++) {
+               if (fb_temp < feedback_temp_array[index])
                        break;
-               else
-                       di->chg_v_lmt = (i << CHG_VOL_SHIFT);
-       }
-
-       for (i = 0; i < ARRAY_SIZE(CHG_I_LMT); i++) {
-               if (chg_ilim < CHG_I_LMT[i])
-                       break;
-               else
-                       di->chg_i_lmt = (i << CHG_ILIM_SHIFT);
+               reg = (index << FB_TEMP_SHIFT);
        }
 
-       for (i = 0; i < ARRAY_SIZE(CHG_I_CUR); i++) {
-               if (chg_cur < CHG_I_CUR[i])
-                       break;
-               else
-                       di->chg_i_cur = (i << CHG_ICUR_SHIFT);
-       }
-       DBG("<%s>. vol = 0x%x, i_lim = 0x%x, cur=0x%x\n",
-           __func__, di->chg_v_lmt, di->chg_i_lmt, di->chg_i_cur);
+       return reg;
 }
 
-static u8 rk81x_chose_finish_ma(int fcc)
+static u8 rk818_bat_parse_finish_ma(struct rk818_battery *di, int fcc)
 {
-       u8 ma = FINISH_150MA;
+       u8 ma;
 
-       if (fcc < 3000)
+       if (di->pdata->sample_res == SAMPLE_RES_10MR)
                ma = FINISH_100MA;
-
-       else if (fcc >= 3000 && fcc <= 4000)
-               ma = FINISH_150MA;
-
-       else if (fcc > 4000 && fcc <= 5000)
-               ma = FINISH_200MA;
-
-       else/*fcc > 5000*/
+       else if (fcc > 5000)
                ma = FINISH_250MA;
+       else if (fcc >= 4000)
+               ma = FINISH_200MA;
+       else if (fcc >= 3000)
+               ma = FINISH_150MA;
+       else
+               ma = FINISH_100MA;
 
        return ma;
 }
 
-static void rk81x_battery_charger_init(struct  battery_info *di)
+static void rk818_bat_init_chrg_config(struct rk818_battery *di)
 {
-       u8 chrg_ctrl_reg1, usb_ctrl_reg, chrg_ctrl_reg2, chrg_ctrl_reg3;
-       u8 sup_sts_reg, thremal_reg;
-       int chg_vol, chg_cur, chg_ilim;
-       u8 finish_ma;
-
-       chg_vol = di->rk818->battery_data->max_charger_voltagemV;
-
-       if (di->fg_drv_mode == TEST_POWER_MODE) {
-               chg_cur = di->test_chrg_current;
-               chg_ilim = di->test_chrg_ilmt;
-       } else {
-               chg_cur = di->rk818->battery_data->max_charger_currentmA;
-               chg_ilim = di->rk818->battery_data->max_charger_ilimitmA;
-       }
+       u8 usb_ctrl, chrg_ctrl2, chrg_ctrl3;
+       u8 thermal, ggcon, finish_ma, fb_temp;
 
-       rk81x_fg_match_param(di, chg_vol, chg_ilim, chg_cur);
-       finish_ma = rk81x_chose_finish_ma(di->fcc);
+       finish_ma = rk818_bat_parse_finish_ma(di, di->fcc);
+       fb_temp = rk818_bat_parse_fb_temperature(di);
 
-       battery_read(di->rk818, THERMAL_REG, &thremal_reg, 1);
-       battery_read(di->rk818, USB_CTRL_REG, &usb_ctrl_reg, 1);
-       battery_read(di->rk818, CHRG_CTRL_REG1, &chrg_ctrl_reg1, 1);
-       battery_read(di->rk818, CHRG_CTRL_REG2, &chrg_ctrl_reg2, 1);
-       battery_read(di->rk818, SUP_STS_REG, &sup_sts_reg, 1);
-       battery_read(di->rk818, CHRG_CTRL_REG3, &chrg_ctrl_reg3, 1);
+       ggcon = rk818_bat_read(di, RK818_GGCON_REG);
+       thermal = rk818_bat_read(di, RK818_THERMAL_REG);
+       usb_ctrl = rk818_bat_read(di, RK818_USB_CTRL_REG);
+       chrg_ctrl2 = rk818_bat_read(di, RK818_CHRG_CTRL_REG2);
+       chrg_ctrl3 = rk818_bat_read(di, RK818_CHRG_CTRL_REG3);
 
+       /* set charge finish current */
+       chrg_ctrl3 |= CHRG_TERM_DIG_SIGNAL;
+       chrg_ctrl2 &= ~FINISH_CUR_MSK;
+       chrg_ctrl2 |= finish_ma;
 
-       usb_ctrl_reg &= (~0x0f);
+       /* disable cccv mode */
+       chrg_ctrl3 &= ~CHRG_TIMER_CCCV_EN;
 
-       if (rk81x_support_adp_type(HW_ADP_TYPE_USB))
-               usb_ctrl_reg |= (CHRG_CT_EN | ILIM_450MA);/*en temp feed back*/
+       /* set feed back temperature */
+       if (di->pdata->fb_temp)
+               usb_ctrl |= CHRG_CT_EN;
        else
-               usb_ctrl_reg |= (CHRG_CT_EN | di->chg_i_lmt);
+               usb_ctrl &= ~CHRG_CT_EN;
+       thermal &= ~FB_TEMP_MSK;
+       thermal |= fb_temp;
 
-       thremal_reg &= (~0x0c);
-       thremal_reg |= TEMP_105C;/*temp feed back: 105c*/
+       /* adc current mode */
+       ggcon |= ADC_CUR_MODE;
 
-       chrg_ctrl_reg1 &= (0x00);
-       chrg_ctrl_reg1 |= (CHRG_EN) | (di->chg_v_lmt | di->chg_i_cur);
+       rk818_bat_write(di, RK818_GGCON_REG, ggcon);
+       rk818_bat_write(di, RK818_THERMAL_REG, thermal);
+       rk818_bat_write(di, RK818_USB_CTRL_REG, usb_ctrl);
+       rk818_bat_write(di, RK818_CHRG_CTRL_REG2, chrg_ctrl2);
+       rk818_bat_write(di, RK818_CHRG_CTRL_REG3, chrg_ctrl3);
+}
+
+static void rk818_bat_init_coffset(struct rk818_battery *di)
+{
+       int coffset, ioffset;
 
-       chrg_ctrl_reg3 |= CHRG_TERM_DIG_SIGNAL;/* digital finish mode*/
-       chrg_ctrl_reg2 &= ~(0xc7);
-       chrg_ctrl_reg2 |= finish_ma | CHG_CCCV_6HOUR;
+       ioffset = rk818_bat_get_ioffset(di);
+       di->poffset = rk818_bat_read(di, RK818_POFFSET_REG);
+       if (!di->poffset)
+               di->poffset = DEFAULT_POFFSET;
 
-       sup_sts_reg &= ~(0x01 << 3);
-       sup_sts_reg |= (0x01 << 2);
+       coffset = di->poffset + ioffset;
+       if (coffset < INVALID_COFFSET_MIN || coffset > INVALID_COFFSET_MAX)
+               coffset = DEFAULT_COFFSET;
 
-       thremal_reg &= (~0x0c);
-       thremal_reg |= TEMP_105C;/*temp feed back: 105c*/
+       rk818_bat_set_coffset(di, coffset);
 
-       battery_write(di->rk818, THERMAL_REG, &thremal_reg, 1);
-       battery_write(di->rk818, CHRG_CTRL_REG3, &chrg_ctrl_reg3, 1);
-       battery_write(di->rk818, USB_CTRL_REG, &usb_ctrl_reg, 1);
-       battery_write(di->rk818, CHRG_CTRL_REG1, &chrg_ctrl_reg1, 1);
-       battery_write(di->rk818, CHRG_CTRL_REG2, &chrg_ctrl_reg2, 1);
-       battery_write(di->rk818, SUP_STS_REG, &sup_sts_reg, 1);
+       DBG("<%s>. offset: p=0x%x, i=0x%x, c=0x%x\n",
+           __func__, di->poffset, ioffset, rk818_bat_get_coffset(di));
 }
 
-void charge_disable_open_otg(int value)
+static void rk818_bat_caltimer_isr(unsigned long data)
 {
-       struct  battery_info *di = g_battery;
+       struct rk818_battery *di = (struct rk818_battery *)data;
 
-       if (value == 1) {
-               DBG("charge disable, enable OTG.\n");
-               rk818_set_bits(di->rk818, CHRG_CTRL_REG1, 1 << 7, 0 << 7);
-               rk818_set_bits(di->rk818, 0x23, 1 << 7, 1 << 7);
-       }
-       if (value == 0) {
-               DBG("charge enable, disable OTG.\n");
-               rk818_set_bits(di->rk818, 0x23, 1 << 7, 0 << 7);
-               rk818_set_bits(di->rk818, CHRG_CTRL_REG1, 1 << 7, 1 << 7);
-       }
+       mod_timer(&di->caltimer, jiffies + MINUTE(8) * HZ);
+       queue_delayed_work(di->bat_monitor_wq, &di->calib_delay_work,
+                          msecs_to_jiffies(10));
 }
 
-static void rk81x_low_waring_init(struct battery_info *di)
+static void rk818_bat_internal_calib(struct work_struct *work)
 {
-       u8 vb_mon_reg;
-       u8 vb_mon_reg_init;
+       int ioffset, poffset;
+       struct rk818_battery *di = container_of(work,
+                       struct rk818_battery, calib_delay_work.work);
+
+       /* calib coffset */
+       poffset = rk818_bat_read(di, RK818_POFFSET_REG);
+       if (poffset)
+               di->poffset = poffset;
+       else
+               di->poffset = DEFAULT_POFFSET;
 
-       battery_read(di->rk818, VB_MOD_REG, &vb_mon_reg, 1);
+       ioffset = rk818_bat_get_ioffset(di);
+       rk818_bat_set_coffset(di, ioffset + di->poffset);
 
-       /* 3.4v: interrupt*/
-       vb_mon_reg_init = (((vb_mon_reg | (1 << 4)) & (~0x07)) | 0x06);
-       battery_write(di->rk818, VB_MOD_REG, &vb_mon_reg_init, 1);
+       /* calib voltage kb */
+       rk818_bat_init_voltage_kb(di);
+       BAT_INFO("caltimer: ioffset=0x%x, coffset=0x%x, poffset=%d\n",
+                ioffset, rk818_bat_get_coffset(di), di->poffset);
 }
 
-static void rk81x_fg_init(struct battery_info *di)
+static void rk818_bat_init_caltimer(struct rk818_battery *di)
 {
-       u8 adc_ctrl_val;
-       u8 buf = 0;
-       u8 pcb_offset;
-       int cal_offset;
+       setup_timer(&di->caltimer, rk818_bat_caltimer_isr, (unsigned long)di);
+       di->caltimer.expires = jiffies + MINUTE(8) * HZ;
+       add_timer(&di->caltimer);
+       INIT_DELAYED_WORK(&di->calib_delay_work, rk818_bat_internal_calib);
+}
 
-       adc_ctrl_val = 0x30;
-       battery_write(di->rk818, ADC_CTRL_REG, &adc_ctrl_val, 1);
+static void rk818_bat_init_zero_table(struct rk818_battery *di)
+{
+       int i, diff, min, max;
+       size_t ocv_size, length;
 
-       _gauge_enable(di);
-       /* get the volatege offset */
-       _get_voltage_offset_value(di);
-       rk81x_battery_charger_init(di);
-       _set_relax_thres(di);
+       ocv_size = di->pdata->ocv_size;
+       length = sizeof(di->pdata->zero_table) * ocv_size;
+       di->pdata->zero_table =
+                       devm_kzalloc(di->dev, length, GFP_KERNEL);
+       if (!di->pdata->zero_table) {
+               di->pdata->zero_table = di->pdata->ocv_table;
+               dev_err(di->dev, "malloc zero table fail\n");
+               return;
+       }
 
-       /* get the current offset , the value write to the CAL_OFFSET */
-       di->current_offset = _get_ioffset(di);
-       battery_read(di->rk818, PCB_IOFFSET_REG, &pcb_offset, 1);
-       DBG("<%s>. pcb_offset = 0x%x\n", __func__, pcb_offset);
-       DBG("<%s>. io_offset = 0x%x\n", __func__, di->current_offset);
+       min = di->pdata->pwroff_vol,
+       max = di->pdata->ocv_table[ocv_size - 4];
+       diff = (max - min) / DIV(ocv_size - 1);
+       for (i = 0; i < ocv_size; i++)
+               di->pdata->zero_table[i] = min + (i * diff);
 
-       _set_cal_offset(di, di->current_offset+pcb_offset);
-       cal_offset = _get_cal_offset(di);
-       if ((cal_offset < 0x7ff) || (pcb_offset == 0))
-               _set_cal_offset(di, di->current_offset+42);
+       for (i = 0; i < ocv_size; i++)
+               DBG("zero[%d] = %d\n", i, di->pdata->zero_table[i]);
 
-       _rsoc_init(di);
-       _capacity_init(di, di->nac);
+       for (i = 0; i < ocv_size; i++)
+               DBG("ocv[%d] = %d\n", i, di->pdata->ocv_table[i]);
+}
 
-       di->remain_capacity = _get_realtime_capacity(di);
-       di->current_avg = _get_average_current(di);
+static void rk818_bat_calc_sm_linek(struct rk818_battery *di)
+{
+       int linek, current_avg;
+       u8 diff, delta;
 
-       rk81x_low_waring_init(di);
-       restart_relax(di);
-       power_on_save(di, di->voltage_ocv);
-       battery_write(di->rk818, OCV_VOL_VALID_REG, &buf, 1);
+       delta = abs(di->dsoc - di->rsoc);
+       diff = delta * 3;/* speed:3/4 */
+       current_avg = rk818_bat_get_avg_current(di);
+       if (current_avg >= 0) {
+               if (di->dsoc < di->rsoc)
+                       linek = 1000 * (delta + diff) / DIV(diff);
+               else if (di->dsoc > di->rsoc)
+                       linek = 1000 * diff / DIV(delta + diff);
+               else
+                       linek = 1000;
+               di->dbg_meet_soc = (di->dsoc >= di->rsoc) ?
+                                  (di->dsoc + diff) : (di->rsoc + diff);
+       } else {
+               if (di->dsoc < di->rsoc)
+                       linek = -1000 * diff / DIV(delta + diff);
+               else if (di->dsoc > di->rsoc)
+                       linek = -1000 * (delta + diff) / DIV(diff);
+               else
+                       linek = -1000;
+               di->dbg_meet_soc = (di->dsoc >= di->rsoc) ?
+                                  (di->dsoc - diff) : (di->rsoc - diff);
+       }
 
-       /* set sample time for cal_offset interval*/
-       ioffset_sample_time(di, SAMP_TIME_8MIN);
-       dump_gauge_register(di);
-       dump_charger_register(di);
+       di->sm_linek = linek;
+       di->sm_remain_cap = di->remain_cap;
+       di->dbg_calc_dsoc = di->dsoc;
+       di->dbg_calc_rsoc = di->rsoc;
 
-       DBG("<%s> :\n"
-           "nac = %d , remain_capacity = %d\n"
-           "OCV_voltage = %d, voltage = %d\n"
-           "SOC = %d, fcc = %d\n, current=%d\n"
-           "cal_offset = 0x%x\n",
-           __func__,
-           di->nac, di->remain_capacity,
-           di->voltage_ocv, di->voltage,
-           di->real_soc, di->fcc, di->current_avg,
-           cal_offset);
+       DBG("<%s>.diff=%d, k=%d, cur=%d\n", __func__, diff, linek, current_avg);
 }
-/*
- * this is a very important algorithm to avoid over discharge.
- */
-/* int R_soc, D_soc, r_soc, zq, k, Q_err, Q_ocv; */
-static void zero_get_soc(struct battery_info *di)
+
+static void rk818_bat_calc_zero_linek(struct rk818_battery *di)
 {
        int dead_voltage, ocv_voltage;
-       int temp_soc = -1, real_soc;
-       int currentold, currentnow, voltage;
-       int i;
-       int voltage_k;
-       int count_num = 0;
-       int q_ocv;
-       int ocv_soc;
+       int voltage_avg, current_avg, vsys;
+       int ocv_cap, dead_cap, xsoc;
+       int ocv_soc, dead_soc;
+       int pwroff_vol;
+       int i, cnt, vol_old, vol_now;
+       int org_linek = 0, min_gap_xsoc;
+
+       if ((abs(di->current_avg) < 500) && (di->dsoc > 10))
+               pwroff_vol = di->pdata->pwroff_vol + 50;
+       else
+               pwroff_vol = di->pdata->pwroff_vol;
 
-       DBG("\n\n+++++++zero mode++++++display soc+++++++++++\n");
        do {
-               currentold = _get_average_current(di);
-               _get_cal_offset(di);
-               _get_ioffset(di);
+               vol_old = rk818_bat_get_avg_voltage(di);
+               msleep(100);
+               vol_now = rk818_bat_get_avg_voltage(di);
+               cnt++;
+       } while ((vol_old == vol_now) && (cnt < 11));
+
+       voltage_avg = 0;
+       for (i = 0; i < 10; i++) {
+               voltage_avg += rk818_bat_get_avg_voltage(di);
                msleep(100);
-               currentnow = _get_average_current(di);
-               count_num++;
-       } while ((currentold == currentnow) && (count_num < 11));
-
-       voltage  = 0;
-       for (i = 0; i < 10 ; i++)
-               voltage += _get_battery_voltage(di);
-       voltage /= 10;
-
-       if (di->voltage_old == 0)
-               di->voltage_old = voltage;
-       voltage_k = voltage;
-       voltage = (di->voltage_old*2 + 8*voltage)/10;
-       di->voltage_old = voltage;
-       currentnow = _get_average_current(di);
-
-       dead_voltage = 3400 + abs32_int(currentnow)*(di->bat_res+65)/1000;
-       /* 65 mo power-path mos */
-       ocv_voltage = voltage + abs32_int(currentnow)*di->bat_res/1000;
-       DBG("ZERO: dead_voltage(shtd) = %d, ocv_voltage(now) = %d\n",
+       }
+
+       /* calc estimate ocv voltage */
+       voltage_avg /= 10;
+       current_avg = rk818_bat_get_avg_current(di);
+       vsys = voltage_avg + (current_avg * DEF_PWRPATH_RES) / 1000;
+
+       DBG("ZERO0: shtd_vol: org = %d, now = %d, zero_reserve_dsoc = %d\n",
+           di->pdata->pwroff_vol, pwroff_vol, di->pdata->zero_reserve_dsoc);
+
+       dead_voltage = pwroff_vol - current_avg *
+                               (di->bat_res + DEF_PWRPATH_RES) / 1000;
+       ocv_voltage = voltage_avg - (current_avg * di->bat_res) / 1000;
+       DBG("ZERO0: dead_voltage(shtd) = %d, ocv_voltage(now) = %d\n",
            dead_voltage, ocv_voltage);
 
-       ocv_soc = _voltage_to_capacity(di, dead_voltage);
-       di->q_dead = di->temp_nac;
-       DBG("ZERO: dead_voltage_soc = %d, q_dead = %d\n",
-           ocv_soc, di->q_dead);
-
-       ocv_soc = _voltage_to_capacity(di, ocv_voltage);
-       q_ocv = di->temp_nac;
-       DBG("ZERO: ocv_voltage_soc = %d, q_ocv = %d\n",
-           ocv_soc, q_ocv);
-
-       /*[Q_err]: Qerr, [temp_nac]:check_voltage_nac*/
-       di->q_err = di->remain_capacity - q_ocv;
-       DBG("q_err=%d, [remain_capacity]%d - [q_ocv]%d",
-           di->q_err, di->remain_capacity, q_ocv);
-
-       if (di->display_soc == 0)
-               di->display_soc = di->real_soc*1000;
-       real_soc = di->display_soc;
-
-       DBG("remain_capacity = %d, q_dead = %d, q_err = %d\n",
-           di->remain_capacity, di->q_dead, di->q_err);
-       /*[temp_nac]:dead_voltage*/
-       if (q_ocv > di->q_dead) {
-               DBG("first: q_ocv > di->q_dead\n");
-
-               /*initical K0*/
-               if ((di->update_k == 0) || (di->zero_cycle >= 500)) {
-                       DBG("[K == 0]\n");
-                       di->zero_cycle = 0;
-                       di->update_k = 1;
-                       /* ZQ = Q_ded +  Qerr */
-                       /*[temp_nac]:dead_voltage*/
-                       di->q_shtd = di->q_dead + di->q_err;
-                       temp_soc = (di->remain_capacity - di->q_shtd)*
-                                       1000/div(di->fcc);
-                       if (temp_soc == 0)
-                               di->update_k = 0;
-                       else
-                               di->line_k = (real_soc + temp_soc/2)
-                                               /div(temp_soc);
-               /* recalc K0*/
-               } else if (di->zero_updated && di->update_k >= 10) {
-                       DBG("[K >= 10].\n");
-                       di->update_k = 1;
-                       _voltage_to_capacity(di, dead_voltage);
-                       di->q_dead = di->temp_nac;
-                       di->q_shtd = di->q_dead + di->q_err;
-                       temp_soc = ((di->remain_capacity - di->q_shtd)*
-                               1000 + di->fcc/2)/div(di->fcc); /* z1 */
-                       if (temp_soc == 0)
-                               di->update_k = 0;
+       /* calc estimate soc and cap */
+       dead_soc = rk818_bat_vol_to_zerosoc(di, dead_voltage);
+       dead_cap = rk818_bat_vol_to_zerocap(di, dead_voltage);
+       DBG("ZERO0: dead_soc = %d, dead_cap = %d\n",
+           dead_soc, dead_cap);
+
+       ocv_soc = rk818_bat_vol_to_zerosoc(di, ocv_voltage);
+       ocv_cap = rk818_bat_vol_to_zerocap(di, ocv_voltage);
+       DBG("ZERO0: ocv_soc = %d, ocv_cap = %d\n",
+           ocv_soc, ocv_cap);
+
+       /* xsoc: available rsoc */
+       xsoc = ocv_soc - dead_soc;
+
+       /* min_gap_xsoc: reserve xsoc */
+       if (abs(current_avg) > ZERO_LOAD_LVL1)
+               min_gap_xsoc = ZERO_GAP_XSOC3;
+       else if (abs(current_avg) > ZERO_LOAD_LVL2)
+               min_gap_xsoc = ZERO_GAP_XSOC2;
+       else
+               min_gap_xsoc = ZERO_GAP_XSOC1;
+
+       if ((xsoc <= 30) && (di->dsoc >= di->pdata->zero_reserve_dsoc))
+               min_gap_xsoc = min_gap_xsoc + ZERO_GAP_CALIB;
+
+       di->zero_remain_cap = di->remain_cap;
+       di->zero_timeout_cnt = 0;
+       if ((di->dsoc <= 1) && (xsoc > 0)) {
+               di->zero_linek = 400;
+               di->zero_drop_sec = 0;
+       } else if (xsoc >= 0) {
+               di->zero_drop_sec = 0;
+               di->zero_linek = (di->zero_dsoc + xsoc / 2) / DIV(xsoc);
+               org_linek = di->zero_linek;
+               /* battery energy mode to use up voltage */
+               if ((di->pdata->energy_mode) &&
+                   (xsoc - di->dsoc >= ZERO_GAP_XSOC3) &&
+                   (di->dsoc <= 10) && (di->zero_linek < 300)) {
+                       di->zero_linek = 300;
+                       DBG("ZERO-new: zero_linek adjust step0...\n");
+               /* reserve enough power yet, slow down any way */
+               } else if ((xsoc - di->dsoc >= min_gap_xsoc) ||
+                          ((xsoc - di->dsoc >= ZERO_GAP_XSOC2) &&
+                           (di->dsoc <= 10) && (xsoc > 15))) {
+                       if (xsoc <= 20 &&
+                           di->dsoc >= di->pdata->zero_reserve_dsoc)
+                               di->zero_linek = 1200;
+                       else if (xsoc - di->dsoc >= 2 * min_gap_xsoc)
+                               di->zero_linek = 400;
+                       else if (xsoc - di->dsoc >= 3 + min_gap_xsoc)
+                               di->zero_linek = 600;
                        else
-                               di->line_k = (real_soc + temp_soc/2)
-                                               /div(temp_soc);
-
-                       DBG("[K >= 10]. new:line_k = %d\n", di->line_k);
-                       DBG("[K >= 10]. new:Y0(dis_soc)=%d\n", di->display_soc);
-                       DBG("[K >= 10]. new:X0(temp) = %d\n", temp_soc);
-
-               } else { /*update_k[1~9]*/
-                       DBG("[K1~9]\n");
-                       di->zero_cycle++;
-                       di->update_k++;
-                       DBG("[K1~9]. (old)Y0=%d, Y0=%d\n",
-                           di->old_display_soc, di->display_soc);
-                       if (di->update_k == 2)
-                               di->old_display_soc = di->display_soc;
-
-                       temp_soc = ((di->remain_capacity - di->q_shtd)*
-                               1000 + di->fcc/2)/div(di->fcc);
-                       real_soc = di->line_k*temp_soc;
-                       di->display_soc = real_soc;
-
-                       /* make sure display_soc change at least once*/
-                       if (di->display_soc >= di->old_display_soc)
-                               di->zero_updated = false;
+                               di->zero_linek = 800;
+                       DBG("ZERO-new: zero_linek adjust step1...\n");
+               /* control zero mode beginning enter */
+               } else if ((di->zero_linek > 1800) && (di->dsoc > 70)) {
+                       di->zero_linek = 1800;
+                       DBG("ZERO-new: zero_linek adjust step2...\n");
+               /* dsoc close to xsoc: it must reserve power */
+               } else if ((di->zero_linek > 1000) && (di->zero_linek < 1200)) {
+                       di->zero_linek = 1200;
+                       DBG("ZERO-new: zero_linek adjust step3...\n");
+               /* dsoc[5~15], dsoc < xsoc */
+               } else if ((di->dsoc <= 15 && di->dsoc > 5) &&
+                          (di->zero_linek <= 1200)) {
+                       /* slow down */
+                       if (xsoc - di->dsoc >= min_gap_xsoc)
+                               di->zero_linek = 800;
+                       /* reserve power */
                        else
-                               di->zero_updated = true;
-
-                       DBG("[K1~9]. (temp_soc)X0 = %d\n", temp_soc);
-                       DBG("[K1~9]. line_k = %d\n", di->line_k);
-                       DBG("[K1~9]. (dis-soc)Y0=%d,real-soc=%d\n",
-                           di->display_soc, di->real_soc);
-
-                       if ((di->display_soc+500)/1000 < di->real_soc) {
-                               /*special for 0%*/
-                               if ((di->real_soc == 1) &&
-                                   (di->display_soc < 100))
-                                       di->real_soc--;
+                               di->zero_linek = 1200;
+                       DBG("ZERO-new: zero_linek adjust step4...\n");
+               /* dsoc[5, 100], dsoc < xsoc */
+               } else if ((di->zero_linek < 1000) && (di->dsoc >= 5)) {
+                       if ((xsoc - di->dsoc) < min_gap_xsoc) {
+                               /* reserve power */
+                               di->zero_linek = 1200;
+                       } else {
+                               if (abs(di->current_avg) > 500)/* heavy */
+                                       di->zero_linek = 900;
                                else
-                                       di->real_soc--;
-                               /*di->odd_capacity = 0;*/
+                                       di->zero_linek = 1000;
                        }
+                       DBG("ZERO-new: zero_linek adjust step5...\n");
+               /* dsoc[0~5], dsoc < xsoc */
+               } else if ((di->zero_linek < 1000) && (di->dsoc <= 5)) {
+                       if ((xsoc - di->dsoc) <= 3)
+                               di->zero_linek = 1200;
+                       else
+                               di->zero_linek = 800;
+                               DBG("ZERO-new: zero_linek adjust step6...\n");
                }
        } else {
-               DBG("second: q_ocv < di->q_dead\n");
-               di->update_k++;
-
-               if (di->voltage < 3400) {
-                       DBG("second: voltage < 3400\n");
-                       di->real_soc--;
-               } else {
-                       if (di->update_k > 10) {
-                               di->update_k = 0;
-                               di->real_soc--;
-                               di->odd_capacity = 0;
-                       }
+               /* xsoc < 0 */
+               di->zero_linek = 1000;
+               if (!di->zero_drop_sec)
+                       di->zero_drop_sec = get_boot_sec();
+               if (base2sec(di->zero_drop_sec) >= WAIT_DSOC_DROP_SEC) {
+                       DBG("ZERO0: t=%lu\n", base2sec(di->zero_drop_sec));
+                       di->zero_drop_sec = 0;
+                       di->dsoc--;
+                       di->zero_dsoc = (di->dsoc + 1) * 1000 -
+                                               MIN_ACCURACY;
                }
        }
 
-       if (di->line_k <= 0) {
-               reset_zero_var(di);
-               DBG("ZERO: line_k <= 0, Update line_k!\n");
+       if (voltage_avg < pwroff_vol - 70) {
+               if (!di->shtd_drop_sec)
+                       di->shtd_drop_sec = get_boot_sec();
+               if (base2sec(di->shtd_drop_sec) > WAIT_SHTD_DROP_SEC) {
+                       BAT_INFO("voltage extreme low...soc:%d->0\n", di->dsoc);
+                       di->shtd_drop_sec = 0;
+                       di->dsoc = 0;
+               }
+       } else {
+               di->shtd_drop_sec = 0;
        }
 
-       DBG("ZERO: update_k=%d, odd_cap=%d\n", di->update_k, di->odd_capacity);
-       DBG("ZERO: q_ocv - q_dead=%d\n", (q_ocv-di->q_dead));
-       DBG("ZERO: remain_cap - q_shtd=%d\n",
-           (di->remain_capacity - di->q_shtd));
-       DBG("ZERO: (line_k)K0 = %d,(disp-soc)Y0 = %d, (temp_soc)X0 = %d\n",
-           di->line_k, di->display_soc, temp_soc);
-       DBG("ZERO: zero_cycle=%d,(old)Y0=%d, zero_updated=%d, update_k=%d\n",
-           di->zero_cycle, di->old_display_soc,
-           di->zero_updated, di->update_k);
-
-       DBG("ZERO: remain_capacity=%d, q_shtd(nac)=%d, q_err(Q_rm-q_ocv)=%d\n",
-           di->remain_capacity, di->q_shtd, di->q_err);
-       DBG("ZERO: Warn_voltage=%d,temp_soc=%d,real_soc=%d\n\n",
-           di->warnning_voltage, _get_soc(di), di->real_soc);
+       DBG("ZERO-new: org_linek=%d, zero_linek=%d, dsoc=%d, Xsoc=%d, "
+           "rsoc=%d, gap=%d, v=%d, vsys=%d\n"
+           "ZERO-new: di->zero_dsoc=%d, zero_remain_cap=%d, zero_drop=%ld, "
+           "sht_drop=%ld\n\n",
+           org_linek, di->zero_linek, di->dsoc, xsoc, di->rsoc,
+           min_gap_xsoc, voltage_avg, vsys, di->zero_dsoc, di->zero_remain_cap,
+           base2sec(di->zero_drop_sec), base2sec(di->shtd_drop_sec));
 }
 
-
-static int estimate_bat_ocv_vol(struct battery_info *di)
+static void rk818_bat_finish_algo_prepare(struct rk818_battery *di)
 {
-       return (di->voltage -
-                               (di->bat_res * di->current_avg) / 1000);
+       di->finish_base = get_boot_sec();
+       if (!di->finish_base)
+               di->finish_base = 1;
 }
 
-static int estimate_bat_ocv_soc(struct battery_info *di)
+static void rk818_bat_smooth_algo_prepare(struct rk818_battery *di)
 {
-       int ocv_soc, ocv_voltage;
-
-       ocv_voltage = estimate_bat_ocv_vol(di);
-       ocv_soc = _voltage_to_capacity(di, ocv_voltage);
+       int tmp_soc;
 
-       return ocv_soc;
-}
+       tmp_soc = di->sm_chrg_dsoc / 1000;
+       if (tmp_soc != di->dsoc)
+               di->sm_chrg_dsoc = di->dsoc * 1000;
 
-/* we will estimate a ocv voltage to get a ocv soc.
- * if there is a big offset between ocv_soc and rsoc,
- * we will decide whether we should reinit capacity or not
- */
-static void rsoc_dischrg_calib(struct battery_info *di)
-{
-       int ocv_soc = di->est_ocv_soc;
-       int ocv_volt = di->est_ocv_vol;
-       int temp_soc = _get_soc(di);
-       int max_volt = di->rk818->battery_data->max_charger_voltagemV;
+       tmp_soc = di->sm_dischrg_dsoc / 1000;
+       if (tmp_soc != di->dsoc)
+               di->sm_dischrg_dsoc =
+               (di->dsoc + 1) * 1000 - MIN_ACCURACY;
 
-       if (ocv_volt > max_volt)
-               goto out;
+       DBG("<%s>. tmp_soc=%d, dsoc=%d, dsoc:sm_dischrg=%d, sm_chrg=%d\n",
+           __func__, tmp_soc, di->dsoc, di->sm_dischrg_dsoc, di->sm_chrg_dsoc);
 
-       if (di->discharge_min >= RSOC_CALIB_DISCHGR_TIME) {
-               if ((ocv_soc-temp_soc >= RSOC_DISCHG_ERR_LOWER) ||
-                   (di->temp_soc == 0) ||
-                   (temp_soc-ocv_soc >= RSOC_DISCHG_ERR_UPPER)) {
-                       di->err_chck_cnt++;
-                       di->err_soc_sum += ocv_soc;
-               } else {
-                       goto out;
-               }
-               DBG("<%s>. rsoc err_chck_cnt = %d\n",
-                   __func__, di->err_chck_cnt);
-               DBG("<%s>. rsoc err_soc_sum = %d\n",
-                   __func__, di->err_soc_sum);
-
-               if (di->err_chck_cnt >= RSOC_ERR_CHCK_CNT) {
-                       ocv_soc = di->err_soc_sum / RSOC_ERR_CHCK_CNT;
-                       if (temp_soc-ocv_soc >= RSOC_DISCHG_ERR_UPPER)
-                               ocv_soc += RSOC_COMPS;
-
-                       di->temp_nac = ocv_soc * di->fcc / 100;
-                       _capacity_init(di, di->temp_nac);
-                       di->temp_soc = _get_soc(di);
-                       di->remain_capacity = _get_realtime_capacity(di);
-                       di->err_soc_sum = 0;
-                       di->err_chck_cnt = 0;
-                       DBG("<%s>. update: rsoc = %d\n", __func__, ocv_soc);
-               }
-        } else {
-out:
-               di->err_chck_cnt = 0;
-               di->err_soc_sum = 0;
-       }
+       rk818_bat_calc_sm_linek(di);
 }
 
-static void rsoc_realtime_calib(struct battery_info *di)
+static void rk818_bat_zero_algo_prepare(struct rk818_battery *di)
 {
-       u8 status = di->status;
+       int tmp_dsoc;
 
-       if ((status == POWER_SUPPLY_STATUS_CHARGING) ||
-           (status == POWER_SUPPLY_STATUS_FULL)) {
-               if ((di->current_avg < -10) &&
-                   (di->charge_status != CHARGE_FINISH))
-                       rsoc_dischrg_calib(di);
-               /*
-               else
-                       rsoc_chrg_calib(di);
-               */
+       di->zero_timeout_cnt = 0;
+       tmp_dsoc = di->zero_dsoc / 1000;
+       if (tmp_dsoc != di->dsoc)
+               di->zero_dsoc = (di->dsoc + 1) * 1000 - MIN_ACCURACY;
 
-       } else if (status == POWER_SUPPLY_STATUS_DISCHARGING) {
-               rsoc_dischrg_calib(di);
-       }
+       DBG("<%s>. first calc, reinit linek\n", __func__);
+
+       rk818_bat_calc_zero_linek(di);
 }
 
-/*
- * when there is a big offset between dsoc and rsoc, dsoc needs to
- * speed up to keep pace witch rsoc.
- */
-static bool do_ac_charger_emulator(struct battery_info *di)
+static void rk818_bat_calc_zero_algorithm(struct rk818_battery *di)
 {
-       int delta_soc = di->temp_soc - di->real_soc;
-       u32 soc_time;
+       int tmp_soc = 0, sm_delta_dsoc = 0;
 
-       if ((di->charge_status != CHARGE_FINISH) &&
-           (di->ac_online == ONLINE) &&
-           (delta_soc >= DSOC_CHRG_FAST_EER_RANGE)) {
-               if (di->current_avg < DSOC_CHRG_EMU_CURR)
-                       soc_time = di->fcc*3600/100/
-                                       (abs_int(DSOC_CHRG_EMU_CURR));
-               else
-                       soc_time = di->fcc*3600/100/
-                                       div(abs_int(di->current_avg));
-               di->emu_chg_cnt++;
-               if  (di->emu_chg_cnt > soc_time) {
-                       di->real_soc++;
-                       di->emu_chg_cnt = 0;
-               }
-               DBG("<%s>. soc_time=%d, emu_cnt=%d\n",
-                   __func__, soc_time, di->emu_chg_cnt);
+       tmp_soc = di->zero_dsoc / 1000;
+       if (tmp_soc == di->dsoc)
+               goto out;
 
-               return true;
+       DBG("<%s>. enter: dsoc=%d, rsoc=%d\n", __func__, di->dsoc, di->rsoc);
+       /* when discharge slow down, take sm chrg into calc */
+       if (di->dsoc < di->rsoc) {
+               /* take sm charge rest into calc */
+               tmp_soc = di->sm_chrg_dsoc / 1000;
+               if (tmp_soc == di->dsoc) {
+                       sm_delta_dsoc = di->sm_chrg_dsoc - di->dsoc * 1000;
+                       di->sm_chrg_dsoc = di->dsoc * 1000;
+                       di->zero_dsoc += sm_delta_dsoc;
+                       DBG("ZERO1: take sm chrg,delta=%d\n", sm_delta_dsoc);
+               }
        }
 
-       return false;
-}
-
-/* check voltage and current when dsoc is close to full.
- * we will do a fake charge to adjust charing speed which
- * aims to make battery full charged and match finish signal.
- */
-static bool do_term_chrg_calib(struct battery_info *di)
-{
-       u32 soc_time;
-       u32 *ocv_table = di->platform_data->battery_ocv;
-
-       /*check current and voltage*/
-       if ((di->ac_online == ONLINE && di->real_soc >= 90) &&
-           ((di->current_avg > DSOC_CHG_TERM_CURR) ||
-            (di->voltage < ocv_table[18]+20))) {
-               soc_time = di->fcc*3600/100/(abs32_int(DSOC_CHG_TERM_CURR));
-               di->term_chg_cnt++;
-               if  (di->term_chg_cnt > soc_time) {
-                       di->real_soc++;
-                       di->term_chg_cnt = 0;
+       /* when discharge speed up, take sm dischrg into calc */
+       if (di->dsoc > di->rsoc) {
+               /* take sm discharge rest into calc */
+               tmp_soc = di->sm_dischrg_dsoc / 1000;
+               if (tmp_soc == di->dsoc) {
+                       sm_delta_dsoc = di->sm_dischrg_dsoc -
+                               ((di->dsoc + 1) * 1000 - MIN_ACCURACY);
+                       di->sm_dischrg_dsoc = (di->dsoc + 1) * 1000 -
+                                                               MIN_ACCURACY;
+                       di->zero_dsoc += sm_delta_dsoc;
+                       DBG("ZERO1: take sm dischrg,delta=%d\n", sm_delta_dsoc);
                }
-               DBG("<%s>. soc_time=%d, term_cnt=%d\n",
-                   __func__, soc_time, di->term_chg_cnt);
-
-               return true;
        }
 
-       return false;
-}
-
-static void normal_discharge(struct battery_info *di)
-{
-       int soc_time = 0;
-       int now_current = di->current_avg;
-       int delta_soc = di->real_soc - di->temp_soc;
-
-       if (delta_soc > DSOC_DISCHRG_FAST_EER_RANGE) {
-               soc_time = DSOC_DISCHRG_FAST_DEC_SEC;
-               DBG("<%s>. dsoc decrease fast! delta_soc = %d\n",
-                   __func__, delta_soc);
-       } else {
-               soc_time = di->fcc*3600/100/div(abs_int(now_current));
+       /* check overflow */
+       if (di->zero_dsoc > (di->dsoc + 1) * 1000 - MIN_ACCURACY) {
+               DBG("ZERO1: zero dsoc overflow: %d\n", di->zero_dsoc);
+               di->zero_dsoc = (di->dsoc + 1) * 1000 - MIN_ACCURACY;
        }
 
-       if (di->temp_soc == di->real_soc) {
-               DBG("<%s>. temp_soc == real_soc\n", __func__);
-
-       } else if (di->temp_soc > di->real_soc) {
-               DBG("<%s>. temp_soc > real_soc\n", __func__);
-               di->vol_smooth_time++;
-               if (di->vol_smooth_time > soc_time*3/2) {
-                       di->real_soc--;
-                       di->vol_smooth_time = 0;
-               }
-
-       } else {
-               DBG("<%s>. temp_soc < real_soc\n", __func__);
-               if (di->real_soc == (di->temp_soc + 1)) {
-                       di->change_timer = di->soc_timer;
-                       di->real_soc = di->temp_soc;
+       /* check new dsoc */
+       tmp_soc = di->zero_dsoc / 1000;
+       if (tmp_soc != di->dsoc) {
+               /* avoid dsoc jump when heavy load */
+               if ((di->dsoc - tmp_soc) > 1) {
+                       di->dsoc--;
+                       di->zero_dsoc = (di->dsoc + 1) * 1000 - MIN_ACCURACY;
+                       DBG("ZERO1: heavy load...\n");
                } else {
-                       di->vol_smooth_time++;
-                       if (di->vol_smooth_time > soc_time*3/4) {
-                               di->real_soc--;
-                               di->vol_smooth_time  = 0;
-                       }
+                       di->dsoc = tmp_soc;
                }
+               di->zero_drop_sec = 0;
        }
-       reset_zero_var(di);
-       DBG("<%s>, temp_soc = %d, real_soc = %d\n",
-           __func__, di->temp_soc, di->real_soc);
-       DBG("<%s>, vol_smooth_time = %d, soc_time = %d\n",
-           __func__, di->vol_smooth_time, soc_time);
+
+out:
+       DBG("ZERO1: zero_dsoc(Y0)=%d, dsoc=%d, rsoc=%d, tmp_soc=%d\n",
+           di->zero_dsoc, di->dsoc, di->rsoc, tmp_soc);
+       DBG("ZERO1: sm_dischrg_dsoc=%d, sm_chrg_dsoc=%d\n",
+           di->sm_dischrg_dsoc, di->sm_chrg_dsoc);
 }
 
-static void rk81x_battery_discharge_smooth(struct battery_info *di)
+static void rk818_bat_zero_algorithm(struct rk818_battery *di)
 {
-       int ocv_soc;
-
-       ocv_soc = _voltage_to_capacity(di, 3800);
-       di->temp_soc = _get_soc(di);
+       int delta_cap = 0, delta_soc = 0;
 
-       DBG("<%s>. temp_soc = %d, real_soc = %d\n",
-           __func__, di->temp_soc, di->real_soc);
+       di->zero_timeout_cnt++;
+       delta_cap = di->zero_remain_cap - di->remain_cap;
+       delta_soc = di->zero_linek * (delta_cap * 100) / DIV(di->fcc);
 
-       if (di->voltage < 3800)
+       DBG("ZERO1: zero_linek=%d, zero_dsoc(Y0)=%d, dsoc=%d, rsoc=%d\n"
+           "ZERO1: delta_soc(X0)=%d, delta_cap=%d, zero_remain_cap = %d\n"
+           "ZERO1: timeout_cnt=%d, sm_dischrg=%d, sm_chrg=%d\n\n",
+           di->zero_linek, di->zero_dsoc, di->dsoc, di->rsoc,
+           delta_soc, delta_cap, di->zero_remain_cap,
+           di->zero_timeout_cnt, di->sm_dischrg_dsoc, di->sm_chrg_dsoc);
 
-               zero_get_soc(di);
-       else
-               normal_discharge(di);
-}
-
-static int get_charging_time(struct battery_info *di)
-{
-       return (di->charging_time/60);
+       if ((delta_soc >= MIN_ZERO_DSOC_ACCURACY) ||
+           (di->zero_timeout_cnt > MIN_ZERO_OVERCNT) ||
+           (di->zero_linek == 0)) {
+               DBG("ZERO1:--------- enter calc -----------\n");
+               di->zero_timeout_cnt = 0;
+               di->zero_dsoc -= delta_soc;
+               rk818_bat_calc_zero_algorithm(di);
+               rk818_bat_calc_zero_linek(di);
+       }
 }
 
-static int get_discharging_time(struct battery_info *di)
+static void rk818_bat_dump_time_table(struct rk818_battery *di)
 {
-       return (di->discharging_time/60);
-}
+       u8 i;
+       static int old_index;
+       static int old_min;
+       int mod = di->dsoc % 10;
+       int index = di->dsoc / 10;
+       u32 time;
 
-static int get_finish_time(struct battery_info *di)
-{
-       return (di->finish_time/60);
-}
+       if (rk818_bat_chrg_online(di))
+               time = base2min(di->plug_in_base);
+       else
+               time = base2min(di->plug_out_base);
 
-static void upd_time_table(struct battery_info *di);
-static void collect_debug_info(struct battery_info *di)
-{
-       if ((di->ac_online == ONLINE) || (di->usb_online == ONLINE)) {
-               di->charging_time++;
-               di->discharging_time = 0;
-       } else {
-               di->charging_time = 0;
-               if (di->voltage < 3800)
-                       di->discharging_time += 2;
-               else
-                       di->discharging_time++;
+       if ((mod == 0) && (index > 0) && (old_index != index)) {
+               di->dbg_chrg_min[index - 1] = time - old_min;
+               old_min = time;
+               old_index = index;
        }
-       if (di->charge_status == CHARGE_FINISH)
-               di->finish_time++;
-       else
-               di->finish_time = 0;
-
-       di->charge_min = get_charging_time(di);
-       di->discharge_min = get_discharging_time(di);
-       di->finish_min = get_finish_time(di);
-
-       upd_time_table(di);
-}
-
-static void dump_debug_info(struct battery_info *di)
-{
-       u8 sup_tst_reg, ggcon_reg, ggsts_reg, vb_mod_reg;
-       u8 usb_ctrl_reg, chrg_ctrl_reg1, thremal_reg;
-       u8 chrg_ctrl_reg2, chrg_ctrl_reg3, rtc_val, misc_reg;
-
-       collect_debug_info(di);
-
-       battery_read(di->rk818, MISC_MARK_REG, &misc_reg, 1);
-       battery_read(di->rk818, GGCON, &ggcon_reg, 1);
-       battery_read(di->rk818, GGSTS, &ggsts_reg, 1);
-       battery_read(di->rk818, SUP_STS_REG, &sup_tst_reg, 1);
-       battery_read(di->rk818, VB_MOD_REG, &vb_mod_reg, 1);
-       battery_read(di->rk818, USB_CTRL_REG, &usb_ctrl_reg, 1);
-       battery_read(di->rk818, CHRG_CTRL_REG1, &chrg_ctrl_reg1, 1);
-       battery_read(di->rk818, CHRG_CTRL_REG2, &chrg_ctrl_reg2, 1);
-       battery_read(di->rk818, CHRG_CTRL_REG3, &chrg_ctrl_reg3, 1);
-       battery_read(di->rk818, 0x00, &rtc_val, 1);
-       battery_read(di->rk818, THERMAL_REG, &thremal_reg, 1);
-
-       DBG("\n------------- dump_debug_regs -----------------\n"
-           "GGCON = 0x%2x, GGSTS = 0x%2x, RTC  = 0x%2x\n"
-           "SUP_STS_REG  = 0x%2x, VB_MOD_REG   = 0x%2x\n"
-           "USB_CTRL_REG  = 0x%2x, CHRG_CTRL_REG1 = 0x%2x\n"
-           "THERMAL_REG = 0x%2x, MISC_MARK_REG = 0x%x\n"
-           "CHRG_CTRL_REG2 = 0x%2x, CHRG_CTRL_REG3 = 0x%2x\n\n",
-           ggcon_reg, ggsts_reg, rtc_val,
-           sup_tst_reg, vb_mod_reg,
-           usb_ctrl_reg, chrg_ctrl_reg1,
-           thremal_reg, misc_reg,
-           chrg_ctrl_reg2, chrg_ctrl_reg3
-          );
 
-       DBG(
-           "########################## [read] 3.0############################\n"
-           "--------------------------------------------------------------\n"
-           "realx-voltage = %d, voltage = %d, current-avg = %d\n"
-           "fcc = %d, remain_capacity = %d, ocv_volt = %d\n"
-           "check_ocv = %d, check_soc = %d, bat_res = %d\n"
-           "diplay_soc = %d, cpapacity_soc = %d, test_mode = %d\n"
-           "AC-ONLINE = %d, USB-ONLINE = %d, charging_status = %d\n"
-           "finish_real_soc = %d, finish_temp_soc = %d\n"
-           "i_offset=0x%x, cal_offset=0x%x, adjust_cap=%d\n"
-           "chrg_time = %d, dischrg_time = %d, finish_time = %d\n",
-           get_relax_voltage(di),
-           di->voltage, di->current_avg,
-           di->fcc, di->remain_capacity, _get_OCV_voltage(di),
-           di->est_ocv_vol, di->est_ocv_soc, di->bat_res,
-           di->real_soc, _get_soc(di), di->fg_drv_mode,
-           di->ac_online, di->usb_online, di->status,
-           di->debug_finish_real_soc, di->debug_finish_temp_soc,
-           _get_ioffset(di), _get_cal_offset(di), di->adjust_cap,
-           get_charging_time(di), get_discharging_time(di), get_finish_time(di)
-          );
-       rk81x_get_charge_status(di);
-       DBG("###########################################################\n");
+       for (i = 1; i < 11; i++)
+               DBG("Time[%d]=%d, ", (i * 10), di->dbg_chrg_min[i - 1]);
+       DBG("\n");
 }
 
-static void update_fcc_capacity(struct battery_info *di)
+static void rk818_bat_debug_info(struct rk818_battery *di)
 {
-       int fcc0;
-       int remain_cap;
+       u8 sup_tst, ggcon, ggsts, vb_mod, ts_ctrl, reboot_cnt;
+       u8 usb_ctrl, chrg_ctrl1, thermal;
+       u8 int_sts1, int_sts2;
+       u8 int_msk1, int_msk2;
+       u8 chrg_ctrl2, chrg_ctrl3, rtc, misc, dcdc_en;
+       char *work_mode[] = {"ZERO", "FINISH", "UN", "UN", "SMOOTH"};
+       char *bat_mode[] = {"BAT", "VIRTUAL"};
 
-       remain_cap = di->remain_capacity + di->adjust_cap - di->first_on_cap;
-       DBG("%s: remain_cap:%d, ajust_cap:%d, first_on_cap=%d\n",
-           __func__, remain_cap, di->adjust_cap, di->first_on_cap);
-
-       if ((di->charge_status == CHARGE_FINISH) && (di->dod0_status == 1)) {
-               DBG("%s: dod0:%d, dod0_cap:%d, dod0_level:%d\n",
-                   __func__, di->dod0, di->dod0_capacity, di->dod0_level);
-
-               if (get_level(di) >= di->dod0_level) {
-                       fcc0 = (remain_cap - di->dod0_capacity)*100
-                                       /(100-di->dod0);
-                       if (fcc0 > di->qmax)
-                               fcc0 = di->qmax;
-
-                       DBG("%s: fcc0:%d, fcc:%d\n", __func__, fcc0, di->fcc);
-                       if ((fcc0 < di->fcc) && (fcc0 > 1000)) {
-                               di->fcc = fcc0;
-                               _capacity_init(di, di->fcc);
-                               _save_FCC_capacity(di, di->fcc);
-                               DBG("%s: new fcc0:%d\n", __func__, di->fcc);
-                       }
-               }
-               di->dod0_status = 0;
-       }
-}
+       if (rk818_bat_chrg_online(di))
+               di->plug_out_base = get_boot_sec();
+       else
+               di->plug_in_base = get_boot_sec();
 
-static void debug_get_finish_soc(struct battery_info *di)
-{
-       if (di->charge_status == CHARGE_FINISH) {
-               di->debug_finish_real_soc = di->real_soc;
-               di->debug_finish_temp_soc = di->temp_soc;
-       }
-}
+       rk818_bat_dump_time_table(di);
 
-static void wait_charge_finish_signal(struct battery_info *di)
-{
-       if ((di->charge_status == CHARGE_FINISH) &&
-           (di->voltage > CHG_FINISH_VOL))
-               update_fcc_capacity(di);/* save new fcc*/
+       if (!dbg_enable)
+               return;
+
+       ts_ctrl = rk818_bat_read(di, RK818_TS_CTRL_REG);
+       misc = rk818_bat_read(di, RK818_MISC_MARK_REG);
+       ggcon = rk818_bat_read(di, RK818_GGCON_REG);
+       ggsts = rk818_bat_read(di, RK818_GGSTS_REG);
+       sup_tst = rk818_bat_read(di, RK818_SUP_STS_REG);
+       vb_mod = rk818_bat_read(di, RK818_VB_MON_REG);
+       usb_ctrl = rk818_bat_read(di, RK818_USB_CTRL_REG);
+       chrg_ctrl1 = rk818_bat_read(di, RK818_CHRG_CTRL_REG1);
+       chrg_ctrl2 = rk818_bat_read(di, RK818_CHRG_CTRL_REG2);
+       chrg_ctrl3 = rk818_bat_read(di, RK818_CHRG_CTRL_REG3);
+       rtc = rk818_bat_read(di, 0);
+       thermal = rk818_bat_read(di, RK818_THERMAL_REG);
+       int_sts1 = rk818_bat_read(di, RK818_INT_STS_REG1);
+       int_sts2 = rk818_bat_read(di, RK818_INT_STS_REG2);
+       int_msk1 = rk818_bat_read(di, RK818_INT_STS_MSK_REG1);
+       int_msk2 = rk818_bat_read(di, RK818_INT_STS_MSK_REG2);
+       dcdc_en = rk818_bat_read(di, RK818_DCDC_EN_REG);
+       reboot_cnt = rk818_bat_read(di, RK818_REBOOT_CNT_REG);
+
+       DBG("\n------- DEBUG REGS, [Ver: %s] -------------------\n"
+           "GGCON=0x%2x, GGSTS=0x%2x, RTC=0x%2x, DCDC_EN2=0x%2x\n"
+           "SUP_STS= 0x%2x, VB_MOD=0x%2x, USB_CTRL=0x%2x\n"
+           "THERMAL=0x%2x, MISC_MARK=0x%2x, TS_CTRL=0x%2x\n"
+           "CHRG_CTRL:REG1=0x%2x, REG2=0x%2x, REG3=0x%2x\n"
+           "INT_STS:  REG1=0x%2x, REG2=0x%2x\n"
+           "INT_MSK:  REG1=0x%2x, REG2=0x%2x\n",
+           DRIVER_VERSION, ggcon, ggsts, rtc, dcdc_en,
+           sup_tst, vb_mod, usb_ctrl,
+           thermal, misc, ts_ctrl,
+           chrg_ctrl1, chrg_ctrl2, chrg_ctrl3,
+           int_sts1, int_sts2, int_msk1, int_msk2
+          );
 
-       /* debug msg*/
-       debug_get_finish_soc(di);
+       DBG("###############################################################\n"
+           "Dsoc=%d, Rsoc=%d, Vavg=%d, Iavg=%d, Cap=%d, Fcc=%d, d=%d\n"
+           "K=%d, Mode=%s, Oldcap=%d, Is=%d, Ip=%d, Vs=%d\n"
+           "fb_temp=%d, bat_temp=%d, sample_res=%d\n"
+           "off:i=0x%x, c=0x%x, p=%d, Rbat=%d, age_ocv_cap=%d, fb=%d\n"
+           "adp:finish=%lu, boot_min=%lu, sleep_min=%lu, adc=%d, Vsys=%d\n"
+           "bat:%s, meet: soc=%d, calc: dsoc=%d, rsoc=%d, Vocv=%d\n"
+           "pwr: dsoc=%d, rsoc=%d, vol=%d, halt: st=%d, cnt=%d, reboot=%d\n"
+           "ocv_c=%d: %d -> %d; max_c=%d: %d -> %d; force_c=%d: %d -> %d\n"
+           "min=%d, init=%d, sw=%d, below0=%d, first=%d, changed=%d\n"
+           "###############################################################\n",
+           di->dsoc, di->rsoc, di->voltage_avg, di->current_avg,
+           di->remain_cap, di->fcc, di->rsoc - di->dsoc,
+           di->sm_linek, work_mode[di->work_mode], di->sm_remain_cap,
+           di->res_div * chrg_cur_sel_array[chrg_ctrl1 & 0x0f],
+           chrg_cur_input_array[usb_ctrl & 0x0f],
+           chrg_vol_sel_array[(chrg_ctrl1 & 0x70) >> 4],
+           feedback_temp_array[(thermal & 0x0c) >> 2], di->temperature,
+           di->pdata->sample_res, rk818_bat_get_ioffset(di),
+           rk818_bat_get_coffset(di), di->poffset, di->bat_res,
+           di->age_adjust_cap, di->fb_blank, base2min(di->finish_base),
+           base2min(di->boot_base), di->sleep_sum_sec / 60,
+           di->adc_allow_update,
+           di->voltage_avg + di->current_avg * DEF_PWRPATH_RES / 1000,
+           bat_mode[di->pdata->bat_mode], di->dbg_meet_soc, di->dbg_calc_dsoc,
+           di->dbg_calc_rsoc, di->voltage_ocv, di->dbg_pwr_dsoc,
+           di->dbg_pwr_rsoc, di->dbg_pwr_vol, di->is_halt, di->halt_cnt,
+           reboot_cnt, di->is_ocv_calib, di->ocv_pre_dsoc, di->ocv_new_dsoc,
+           di->is_max_soc_offset, di->max_pre_dsoc, di->max_new_dsoc,
+           di->is_force_calib, di->force_pre_dsoc, di->force_new_dsoc,
+           di->pwroff_min, di->is_initialized, di->is_sw_reset,
+           di->dbg_cap_low0, di->is_first_on, di->last_dsoc
+          );
 }
 
-static void charge_finish_routine(struct battery_info *di)
+static void rk818_bat_init_capacity(struct rk818_battery *di, u32 cap)
 {
-       if ((di->charge_status == CHARGE_FINISH) &&
-           (di->voltage > CHG_FINISH_VOL)) {
-               _capacity_init(di, di->fcc);
-               zero_current_calib(di);
+       int delta_cap;
 
-               if (di->real_soc < 100) {
-                       DBG("<%s>,CHARGE_FINISH:real_soc<100,real_soc=%d\n",
-                           __func__, di->real_soc);
+       delta_cap = cap - di->remain_cap;
+       if (!delta_cap)
+               return;
 
-                       if ((di->soc_counter < 80)) {
-                               di->soc_counter++;
-                       } else {
-                               di->soc_counter = 0;
-                               di->real_soc++;
-                       }
-               }
-       }
+       di->age_adjust_cap += delta_cap;
+       rk818_bat_init_coulomb_cap(di, cap);
+       rk818_bat_smooth_algo_prepare(di);
+       rk818_bat_zero_algo_prepare(di);
 }
 
-static void normal_charge(struct battery_info *di)
+static void rk818_bat_update_age_fcc(struct rk818_battery *di)
 {
-       int now_current, soc_time;
+       int fcc, remain_cap, age_keep_min, lock_fcc;
 
-       now_current = _get_average_current(di);
-       soc_time = di->fcc*3600/100/div(abs_int(now_current));   /* 1%  time; */
-       di->temp_soc = _get_soc(di);
+       lock_fcc = rk818_bat_get_coulomb_cap(di);
+       remain_cap = lock_fcc - di->age_ocv_cap - di->age_adjust_cap;
+       age_keep_min = base2min(di->age_keep_sec);
 
-       DBG("<%s>. temp_soc = %d, real_soc = %d\n",
-           __func__, di->temp_soc, di->real_soc);
-
-       if (di->real_soc == di->temp_soc) {
-               DBG("<%s>. temp_soc == real_soc\n", __func__);
-                   di->temp_soc = _get_soc(di);
-       }
-       if ((di->temp_soc != di->real_soc) && (now_current != 0)) {
-               if (di->temp_soc < di->real_soc + 1) {
-                       DBG("<%s>. temp_soc < real_soc\n", __func__);
-                       di->charge_smooth_time++;
-                       if  (di->charge_smooth_time > soc_time*3/2) {
-                               di->real_soc++;
-                               di->charge_smooth_time  = 0;
-                       }
-                       di->charge_smooth_status = true;
-               }
+       DBG("%s: lock_fcc=%d, age_ocv_cap=%d, age_adjust_cap=%d, remain_cap=%d,"
+           "age_allow_update=%d, age_keep_min=%d\n",
+           __func__, lock_fcc, di->age_ocv_cap, di->age_adjust_cap, remain_cap,
+           di->age_allow_update, age_keep_min);
 
-               else if (di->temp_soc > di->real_soc + 1) {
-                       DBG("<%s>. temp_soc > real_soc\n", __func__);
-                       di->charge_smooth_time++;
-                       if  (di->charge_smooth_time > soc_time*3/4) {
-                               di->real_soc++;
-                               di->charge_smooth_time  = 0;
-                       }
-                       di->charge_smooth_status = true;
-
-               } else if (di->temp_soc == di->real_soc + 1) {
-                       DBG("<%s>. temp_soc == real_soc + 1\n", __func__);
-                       if (di->charge_smooth_status) {
-                               di->charge_smooth_time++;
-                               if (di->charge_smooth_time > soc_time*3/4) {
-                                       di->real_soc = di->temp_soc;
-                                       di->charge_smooth_time  = 0;
-                                       di->charge_smooth_status = false;
-                               }
+       if ((di->chrg_status == CHARGE_FINISH) && (di->age_allow_update) &&
+           (age_keep_min < 1200)) {
+               di->age_allow_update = false;
+               fcc = remain_cap * 100 / DIV(100 - di->age_ocv_soc);
+               BAT_INFO("lock_fcc=%d, calc_cap=%d, age: soc=%d, cap=%d, "
+                        "level=%d, fcc:%d->%d?\n",
+                        lock_fcc, remain_cap, di->age_ocv_soc,
+                        di->age_ocv_cap, di->age_level, di->fcc, fcc);
 
-                       } else {
-                               di->real_soc = di->temp_soc;
-                               di->charge_smooth_status = false;
-                       }
+               if ((fcc < di->qmax) && (fcc > MIN_FCC)) {
+                       BAT_INFO("fcc:%d->%d!\n", di->fcc, fcc);
+                       di->fcc = fcc;
+                       rk818_bat_init_capacity(di, di->fcc);
+                       rk818_bat_save_fcc(di, di->fcc);
+                       rk818_bat_save_age_level(di, di->age_level);
                }
        }
-
-       DBG("<%s>, temp_soc = %d, real_soc = %d\n",
-           __func__, di->temp_soc, di->real_soc);
-       DBG("<%s>, vol_smooth_time = %d, soc_time = %d\n",
-           __func__, di->charge_smooth_time, soc_time);
 }
 
-
-
-static void rk81x_battery_charge_smooth(struct battery_info *di)
+static void rk818_bat_wait_finish_sig(struct rk818_battery *di)
 {
-       reset_zero_var(di);
-       /*calibrate: aim to match finish signal*/
-       if (do_term_chrg_calib(di))
-               return;
+       int chrg_finish_vol = di->pdata->max_chrg_voltage;
 
-       /*calibrate: aim to calib error*/
-       di->term_chg_cnt = 0;
-       if (do_ac_charger_emulator(di))
+       if (!rk818_bat_chrg_online(di))
                return;
 
-       normal_charge(di);
-}
-
-static void rk81x_battery_display_smooth(struct battery_info *di)
-{
-       int status;
-       u8  charge_status;
-
-       status = di->status;
-       charge_status = di->charge_status;
-       if ((status == POWER_SUPPLY_STATUS_CHARGING) ||
-           (status == POWER_SUPPLY_STATUS_FULL)) {
-               if ((di->current_avg < -10) &&
-                   (charge_status != CHARGE_FINISH))
-                       rk81x_battery_discharge_smooth(di);
-               else
-                       rk81x_battery_charge_smooth(di);
-
-       } else if (status == POWER_SUPPLY_STATUS_DISCHARGING) {
-               rk81x_battery_discharge_smooth(di);
-               if (di->real_soc == 1) {
-                       di->time2empty++;
-                       if (di->time2empty >= 300)
-                               di->real_soc = 0;
-               } else {
-                       di->time2empty = 0;
+       if ((di->chrg_status == CHARGE_FINISH) && (di->adc_allow_update) &&
+           (di->voltage_avg > chrg_finish_vol - 150)) {
+               rk818_bat_update_age_fcc(di);
+               if (rk818_bat_adc_calib(di))
+                       di->adc_allow_update = false;
+       }
+}
+
+static void rk818_bat_finish_algorithm(struct rk818_battery *di)
+{
+       unsigned long finish_sec, soc_sec;
+       int plus_soc, finish_current, rest = 0;
+
+       /* rsoc */
+       if ((di->remain_cap != di->fcc) &&
+           (rk818_bat_get_chrg_status(di) == CHARGE_FINISH)) {
+               di->age_adjust_cap += (di->fcc - di->remain_cap);
+               rk818_bat_init_coulomb_cap(di, di->fcc);
+       }
+
+       /* dsoc */
+       if (di->dsoc < 100) {
+               if (!di->finish_base)
+                       di->finish_base = get_boot_sec();
+               finish_current = (di->rsoc - di->dsoc) >  FINISH_MAX_SOC_DELAY ?
+                                       FINISH_CHRG_CUR2 : FINISH_CHRG_CUR1;
+               finish_sec = base2sec(di->finish_base);
+               soc_sec = di->fcc * 3600 / 100 / DIV(finish_current);
+               plus_soc = finish_sec / DIV(soc_sec);
+               if (finish_sec > soc_sec) {
+                       rest = finish_sec % soc_sec;
+                       di->dsoc += plus_soc;
+                       di->finish_base = get_boot_sec();
+                       if (di->finish_base > rest)
+                               di->finish_base = get_boot_sec() - rest;
                }
+               DBG("<%s>.CHARGE_FINISH:dsoc<100,dsoc=%d\n"
+                   "soc_time=%lu, sec_finish=%lu, plus_soc=%d, rest=%d\n",
+                   __func__, di->dsoc, soc_sec, finish_sec, plus_soc, rest);
        }
 }
 
-/*
- * update rsoc by relax voltage
- */
-static void resume_relax_calib(struct battery_info *di)
+static void rk818_bat_calc_smooth_dischrg(struct rk818_battery *di)
 {
-       int relax_vol = di->relax_voltage;
-       int ocv_soc, capacity;
+       int tmp_soc = 0, sm_delta_dsoc = 0, zero_delta_dsoc = 0;
 
-       ocv_soc = _voltage_to_capacity(di, relax_vol);
-       capacity = (ocv_soc * di->fcc / 100);
-       _capacity_init(di, capacity);
-       di->remain_capacity = _get_realtime_capacity(di);
-       di->temp_soc = _get_soc(di);
-       DBG("%s, RSOC=%d, CAP=%d\n", __func__, ocv_soc, capacity);
-}
-
-/* condition:
- * 1: must do it
- * 0: when neccessary
- */
-static void resume_vol_calib(struct battery_info *di, int condition)
-{
-       int ocv_vol = di->est_ocv_vol;
-       int ocv_soc = 0, capacity = 0;
+       tmp_soc = di->sm_dischrg_dsoc / 1000;
+       if (tmp_soc == di->dsoc)
+               goto out;
 
-       ocv_soc = _voltage_to_capacity(di, ocv_vol);
-       capacity = (ocv_soc * di->fcc / 100);
-       if (condition || (abs(ocv_soc-di->temp_soc) >= RSOC_RESUME_ERR)) {
-               _capacity_init(di, capacity);
-               di->remain_capacity = _get_realtime_capacity(di);
-               di->temp_soc = _get_soc(di);
-               DBG("<%s>, rsoc updated!\n", __func__);
+       DBG("<%s>. enter: dsoc=%d, rsoc=%d\n", __func__, di->dsoc, di->rsoc);
+       /* when dischrge slow down, take sm charge rest into calc */
+       if (di->dsoc < di->rsoc) {
+               tmp_soc = di->sm_chrg_dsoc / 1000;
+               if (tmp_soc == di->dsoc) {
+                       sm_delta_dsoc = di->sm_chrg_dsoc - di->dsoc * 1000;
+                       di->sm_chrg_dsoc = di->dsoc * 1000;
+                       di->sm_dischrg_dsoc += sm_delta_dsoc;
+                       DBG("<%s>. take sm dischrg, delta=%d\n",
+                           __func__, sm_delta_dsoc);
+               }
        }
-       DBG("<%s>, OCV_VOL=%d,OCV_SOC=%d, CAP=%d\n",
-           __func__, ocv_vol, ocv_soc, capacity);
-}
-
-/*
- * when support HW_ADP_TYPE_DUAL, and at the moment that usb_adp
- * and dc_adp are plugined in together, the dc_apt has high priority.
- * so we check dc_apt first and return rigth away if it's found.
- */
-static enum charger_type_t rk81x_get_adp_type(struct battery_info *di)
-{
-       u8 buf;
-       enum charger_type_t charger_type = NO_CHARGER;
 
-       /*check by ic hardware: this check make check work safer*/
-       battery_read(di->rk818, VB_MOD_REG, &buf, 1);
-       if ((buf & PLUG_IN_STS) == 0)
-               return NO_CHARGER;
+       /* when discharge speed up, take zero discharge rest into calc */
+       if (di->dsoc > di->rsoc) {
+               tmp_soc = di->zero_dsoc / 1000;
+               if (tmp_soc == di->dsoc) {
+                       zero_delta_dsoc = di->zero_dsoc - ((di->dsoc + 1) *
+                                               1000 - MIN_ACCURACY);
+                       di->zero_dsoc = (di->dsoc + 1) * 1000 - MIN_ACCURACY;
+                       di->sm_dischrg_dsoc += zero_delta_dsoc;
+                       DBG("<%s>. take zero schrg, delta=%d\n",
+                           __func__, zero_delta_dsoc);
+               }
+       }
 
-       /*check DC first*/
-       if (rk81x_support_adp_type(HW_ADP_TYPE_DC)) {
-               charger_type = rk81x_get_dc_state(di);
-               if (charger_type == DC_CHARGER)
-                       return charger_type;
+       /* check up overflow */
+       if ((di->sm_dischrg_dsoc) > ((di->dsoc + 1) * 1000 - MIN_ACCURACY)) {
+               DBG("<%s>. dischrg_dsoc up overflow\n", __func__);
+               di->sm_dischrg_dsoc = (di->dsoc + 1) *
+                                       1000 - MIN_ACCURACY;
        }
 
-       /*HW_ADP_TYPE_USB*/
-       charger_type = rk81x_get_usbac_state(di);
+       /* check new dsoc */
+       tmp_soc = di->sm_dischrg_dsoc / 1000;
+       if (tmp_soc != di->dsoc) {
+               di->dsoc = tmp_soc;
+               di->sm_chrg_dsoc = di->dsoc * 1000;
+       }
+out:
+       DBG("<%s>. dsoc=%d, rsoc=%d, dsoc:sm_dischrg=%d, sm_chrg=%d, zero=%d\n",
+           __func__, di->dsoc, di->rsoc, di->sm_dischrg_dsoc, di->sm_chrg_dsoc,
+           di->zero_dsoc);
 
-       return charger_type;
 }
 
-static void rk81x_sleep_discharge(struct battery_info *di)
+static void rk818_bat_calc_smooth_chrg(struct rk818_battery *di)
 {
-       int delta_cap;
-       int delta_soc;
-       int sleep_min;
-       unsigned long sleep_sec;
-       int enter_rsoc;
-
-       enter_rsoc = di->real_soc;
-       sleep_sec = BASE_TO_SEC(di->suspend_time_start);
-       sleep_min = BASE_TO_MIN(di->suspend_time_start);
-       delta_cap = di->suspend_cap - di->remain_capacity;
-       delta_soc = di->suspend_rsoc - _get_soc(di);
-       di->sum_suspend_cap += delta_cap;
-
-       DBG("<%s>, slp_sec(s)=%lu, slp_min=%d\n"
-           "delta_cap(s)=%d, delta_soc=%d, sum_cap=%d\n"
-           "remain_cap=%d, rsoc=%d, dsoc=%d\n"
-           "relax_vol=%d, vol=%d, curr=%d\n",
-           __func__, sleep_sec, sleep_min,
-           delta_cap, delta_soc, di->sum_suspend_cap,
-           di->remain_capacity, _get_soc(di), di->real_soc,
-           di->relax_voltage, di->voltage, _get_average_current(di));
-
-       /*handle rsoc*/
-       if ((sleep_min >= 30) &&
-           (di->relax_voltage >= di->voltage)) {
-               resume_relax_calib(di);
-               restart_relax(di);
-
-       /* current_avg < 0: make sure the system is not
-        * wakeup by charger plugin.
-        */
-
-       /* even if relax voltage is not caught rightly, realtime voltage
-        * is quite close to relax voltage, we should not do nothing after
-        * sleep 30min
-        */
-       } else if ((sleep_min >= 30) && (di->current_avg < 0)) {
-               resume_vol_calib(di, 1);
-       } else if ((sleep_min >= 3) && (di->current_avg < 0)) {
-               resume_vol_calib(di, 0);
-       }
-
-       /*handle dsoc*/
-       delta_soc = di->sum_suspend_cap/(di->fcc/100);
-
-       DBG("<%s>. sum_cap ==> delta_soc = %d\n", __func__, delta_soc);
-       if (delta_soc > 0) {
-               if (di->real_soc-(delta_soc*1/3) <= di->temp_soc)
-                       di->real_soc -= (delta_soc*1/3);
-               else if (di->real_soc-(delta_soc*1/2) < di->temp_soc)
-                       di->real_soc -= (delta_soc*1/2);
-               else
-                       di->real_soc -= delta_soc;
+       int tmp_soc = 0, sm_delta_dsoc = 0, zero_delta_dsoc = 0;
 
-               /*di->sum_suspend_cap %= (di->fcc/100);*/
-               if (di->real_soc != enter_rsoc)
-                       di->sum_suspend_cap = 0;
-
-       } else if (delta_soc < 0) {
-               di->real_soc--;
-       }
-       DBG("<%s>, out: dsoc=%d, rsoc=%d, sum_cap=%d\n",
-           __func__, di->real_soc, di->temp_soc, di->sum_suspend_cap);
-}
+       tmp_soc = di->sm_chrg_dsoc / 1000;
+       if (tmp_soc == di->dsoc)
+               goto out;
 
-static void rk81x_sleep_charge(struct battery_info *di)
-{
-       unsigned long sleep_soc;
-       unsigned long sleep_sec;
-       int delta_cap;
-       int delta_soc;
-       int sleep_min;
-       u8 charge_status = di->charge_status;
-
-       if ((di->suspend_charge_current >= 0) ||
-           (rk81x_get_charge_status(di) == CHARGE_FINISH)) {
-               sleep_sec = BASE_TO_SEC(di->suspend_time_start);
-               sleep_min = BASE_TO_MIN(di->suspend_time_start);
-               delta_cap = di->suspend_cap - di->remain_capacity;
-               delta_soc = di->suspend_rsoc - _get_soc(di);
-
-               DBG("<%s>, ac=%d, usb=%d, slp_curr=%d\n",
-                   __func__, di->ac_online, di->usb_online,
-                   di->suspend_charge_current);
-               if (((di->suspend_charge_current < 800) &&
-                    (di->ac_online == ONLINE)) ||
-                    (charge_status == CHARGE_FINISH)) {
-                       DBG("<%s>,sleep: ac online current < 800\n", __func__);
-                       if (sleep_sec > 0) {
-                               /*default charge current: 1000mA*/
-                               di->count_sleep_time += sleep_sec;
-                               sleep_soc = 1000*di->count_sleep_time*100
-                                                       /3600/div(di->fcc);
-                               DBG("<%s> sleep_soc=%lu, real_soc=%d\n",
-                                   __func__, sleep_soc, di->real_soc);
-                               if (sleep_soc > 0)
-                                       di->count_sleep_time = 0;
-                               di->real_soc += sleep_soc;
-                               if (di->real_soc > 100)
-                                       di->real_soc = 100;
-                       }
-               } else {
-                       DBG("<%s>, usb charge\n", __func__);
-                       if ((di->temp_soc - di->suspend_rsoc) > 0)
-                               di->real_soc +=
-                                       (di->temp_soc - di->suspend_rsoc);
+       DBG("<%s>. enter: dsoc=%d, rsoc=%d\n", __func__, di->dsoc, di->rsoc);
+       /* when charge slow down, take zero & sm dischrg into calc */
+       if (di->dsoc > di->rsoc) {
+               /* take sm discharge rest into calc */
+               tmp_soc = di->sm_dischrg_dsoc / 1000;
+               if (tmp_soc == di->dsoc) {
+                       sm_delta_dsoc = di->sm_dischrg_dsoc -
+                                       ((di->dsoc + 1) * 1000 - MIN_ACCURACY);
+                       di->sm_dischrg_dsoc = (di->dsoc + 1) * 1000 -
+                                                       MIN_ACCURACY;
+                       di->sm_chrg_dsoc += sm_delta_dsoc;
+                       DBG("<%s>. take sm dischrg, delta=%d\n",
+                          __func__, sm_delta_dsoc);
                }
 
-               DBG("<%s>, out: dsoc=%d, rsoc=%d\n",
-                   __func__, di->real_soc, di->temp_soc);
+               /* take zero discharge rest into calc */
+               tmp_soc = di->zero_dsoc / 1000;
+               if (tmp_soc == di->dsoc) {
+                       zero_delta_dsoc = di->zero_dsoc -
+                       ((di->dsoc + 1) * 1000 - MIN_ACCURACY);
+                       di->zero_dsoc = (di->dsoc + 1) * 1000 - MIN_ACCURACY;
+                       di->sm_chrg_dsoc += zero_delta_dsoc;
+                       DBG("<%s>. take zero dischrg, delta=%d\n",
+                           __func__, zero_delta_dsoc);
+               }
        }
-}
-
-/*
- * we need flag "sys_wakeup" to make sure that the system is reall power up.
- * because there is fake system power up which causes suspend param be cleaned.
- */
-static void update_resume_state(struct battery_info *di)
-{
-       if (di->resume) {
-               di->resume = false;
-               di->sys_wakeup = true;
-               /*update the info first*/
-               rk81x_update_battery_info(di);
-               reset_zero_var(di);
 
-               if (di->sleep_status == POWER_SUPPLY_STATUS_DISCHARGING)
-                       rk81x_sleep_discharge(di);
-
-               else if (di->sleep_status == POWER_SUPPLY_STATUS_CHARGING)
-                       rk81x_sleep_charge(di);
+       /* check down overflow */
+       if (di->sm_chrg_dsoc < di->dsoc * 1000) {
+               DBG("<%s>. chrg_dsoc down overflow\n", __func__);
+               di->sm_chrg_dsoc = di->dsoc * 1000;
        }
-}
 
-static void rk81x_set_charger_current(struct battery_info *di,
-                                     enum charger_type_t charger_type)
-{
-       switch (charger_type) {
-       case NO_CHARGER:
-       case USB_CHARGER:
-               set_charge_current(di, ILIM_450MA);
-               break;
-
-       case AC_CHARGER:
-       case DC_CHARGER:
-               set_charge_current(di, di->chg_i_lmt);
-               break;
-       default:
-               set_charge_current(di, ILIM_450MA);
+       /* check new dsoc */
+       tmp_soc = di->sm_chrg_dsoc / 1000;
+       if (tmp_soc != di->dsoc) {
+               di->dsoc = tmp_soc;
+               di->sm_dischrg_dsoc = (di->dsoc + 1) * 1000 - MIN_ACCURACY;
        }
-}
-
-
-static void rk81x_set_power_supply_state(struct battery_info *di,
-                                        enum charger_type_t  charger_type)
-{
-       di->usb_online = OFFLINE;
-       di->ac_online = OFFLINE;
-       di->dc_online = OFFLINE;
-
-       switch (charger_type) {
-       case NO_CHARGER:
-               di->status = POWER_SUPPLY_STATUS_DISCHARGING;
-               break;
-
-       case USB_CHARGER:
-               di->usb_online = ONLINE;
-               di->status = POWER_SUPPLY_STATUS_CHARGING;
-               break;
-
-       case DC_CHARGER:/*treat dc as ac*/
-               di->dc_online = ONLINE;
-       case AC_CHARGER:
-               di->ac_online = ONLINE;
-               di->status = POWER_SUPPLY_STATUS_CHARGING;
-               break;
-       default:
-               di->status = POWER_SUPPLY_STATUS_DISCHARGING;
+out:
+       DBG("<%s>.dsoc=%d, rsoc=%d, dsoc: sm_dischrg=%d, sm_chrg=%d, zero=%d\n",
+           __func__, di->dsoc, di->rsoc, di->sm_dischrg_dsoc, di->sm_chrg_dsoc,
+           di->zero_dsoc);
+}
+
+static void rk818_bat_smooth_algorithm(struct rk818_battery *di)
+{
+       int ydsoc = 0, delta_cap = 0, old_cap = 0;
+       unsigned long tgt_sec = 0;
+
+       di->remain_cap = rk818_bat_get_coulomb_cap(di);
+
+       /* full charge: slow down */
+       if ((di->dsoc == 99) && (di->chrg_status == CC_OR_CV)) {
+               di->sm_linek = FULL_CHRG_K;
+       /* terminal charge, slow down */
+       } else if ((di->current_avg >= TERM_CHRG_CURR) &&
+           (di->chrg_status == CC_OR_CV) && (di->dsoc >= TERM_CHRG_DSOC)) {
+               di->sm_linek = TERM_CHRG_K;
+               DBG("<%s>. terminal mode..\n", __func__);
+       /* simulate charge, speed up */
+       } else if ((di->current_avg <= SIMULATE_CHRG_CURR) &&
+                  (di->current_avg > 0) && (di->chrg_status == CC_OR_CV) &&
+                  (di->dsoc < TERM_CHRG_DSOC) &&
+                  ((di->rsoc - di->dsoc) >= SIMULATE_CHRG_INTV)) {
+               di->sm_linek = SIMULATE_CHRG_K;
+               DBG("<%s>. simulate mode..\n", __func__);
+       } else {
+               /* charge and discharge switch */
+               if ((di->sm_linek * di->current_avg <= 0) ||
+                   (di->sm_linek == TERM_CHRG_K) ||
+                   (di->sm_linek == FULL_CHRG_K) ||
+                   (di->sm_linek == SIMULATE_CHRG_K)) {
+                       DBG("<%s>. linek mode, retinit sm linek..\n", __func__);
+                       rk818_bat_calc_sm_linek(di);
+               }
        }
 
-       if (di->real_soc >= 100)
-               di->status = POWER_SUPPLY_STATUS_FULL;
-}
-
-static void rk81x_check_battery_status(struct battery_info *di)
-{
-       enum charger_type_t  charger_type;
-
-       charger_type = rk81x_get_adp_type(di);
-       rk81x_set_charger_current(di, charger_type);
-       rk81x_set_power_supply_state(di, charger_type);
-}
-
-
-/* high load: current < 0 with charger in.
- * System will not shutdown while dsoc=0% with charging state(ac_online),
- * which will cause over discharge, so oppose status before report states.
- */
-static void last_check_report(struct battery_info *di)
-{
-       static u32 time;
+       old_cap = di->sm_remain_cap;
+       /*
+        * when dsoc equal rsoc(not include full, term, simulate case),
+        * sm_linek should change to -1000/1000 smoothly to avoid dsoc+1/-1
+        * right away, so change it after flat seconds
+        */
+       if ((di->dsoc == di->rsoc) && (abs(di->sm_linek) != 1000) &&
+           (di->sm_linek != FULL_CHRG_K && di->sm_linek != TERM_CHRG_K &&
+            di->sm_linek != SIMULATE_CHRG_K)) {
+               if (!di->flat_match_sec)
+                       di->flat_match_sec = get_boot_sec();
+               tgt_sec = di->fcc * 3600 / 100 / DIV(abs(di->current_avg)) / 3;
+               if (base2sec(di->flat_match_sec) >= tgt_sec) {
+                       di->flat_match_sec = 0;
+                       di->sm_linek = (di->current_avg >= 0) ? 1000 : -1000;
+               }
+               DBG("<%s>. flat_sec=%ld, tgt_sec=%ld, sm_k=%d\n", __func__,
+                   base2sec(di->flat_match_sec), tgt_sec, di->sm_linek);
+       } else {
+               di->flat_match_sec = 0;
+       }
+
+       /* abs(k)=1000 or dsoc=100, stop calc */
+       if ((abs(di->sm_linek) == 1000) || (di->current_avg >= 0 &&
+            di->chrg_status == CC_OR_CV && di->dsoc >= 100)) {
+               DBG("<%s>. sm_linek=%d\n", __func__, di->sm_linek);
+               if (abs(di->sm_linek) == 1000) {
+                       di->dsoc = di->rsoc;
+                       di->sm_linek = (di->sm_linek > 0) ? 1000 : -1000;
+                       DBG("<%s>. dsoc == rsoc, sm_linek=%d\n",
+                           __func__, di->sm_linek);
+               }
+               di->sm_remain_cap = di->remain_cap;
+               di->sm_chrg_dsoc = di->dsoc * 1000;
+               di->sm_dischrg_dsoc = (di->dsoc + 1) * 1000 - MIN_ACCURACY;
+               DBG("<%s>. sm_dischrg_dsoc=%d, sm_chrg_dsoc=%d\n",
+                   __func__, di->sm_dischrg_dsoc, di->sm_chrg_dsoc);
+       } else {
+               delta_cap = di->remain_cap - di->sm_remain_cap;
+               if (delta_cap == 0) {
+                       DBG("<%s>. delta_cap = 0\n", __func__);
+                       return;
+               }
+               ydsoc = di->sm_linek * abs(delta_cap) * 100 / DIV(di->fcc);
+               if (ydsoc == 0) {
+                       DBG("<%s>. ydsoc = 0\n", __func__);
+                       return;
+               }
+               di->sm_remain_cap = di->remain_cap;
 
-       if ((di->real_soc == 0) &&
-           (di->status == POWER_SUPPLY_STATUS_CHARGING) &&
-          di->current_avg < 0) {
-               if (BASE_TO_SEC(time) > 60)
-                       rk81x_set_power_supply_state(di, NO_CHARGER);
+               DBG("<%s>. k=%d, ydsoc=%d; cap:old=%d, new:%d; delta_cap=%d\n",
+                   __func__, di->sm_linek, ydsoc, old_cap,
+                   di->sm_remain_cap, delta_cap);
 
-               DBG("dsoc=0, time=%ld\n", get_seconds() - time);
-               DBG("status=%d, ac_online=%d, usb_online=%d\n",
-                   di->status, di->ac_online, di->usb_online);
+               /* discharge mode */
+               if (ydsoc < 0) {
+                       di->sm_dischrg_dsoc += ydsoc;
+                       rk818_bat_calc_smooth_dischrg(di);
+               /* charge mode */
+               } else {
+                       di->sm_chrg_dsoc += ydsoc;
+                       rk818_bat_calc_smooth_chrg(di);
+               }
 
-       } else {
-               time = get_seconds();
+               if (di->s2r) {
+                       di->s2r = false;
+                       rk818_bat_calc_sm_linek(di);
+               }
        }
 }
+
 /*
- * only do report when there is a change.
- *
- * if ((di->real_soc == 0) && (di->fg_drv_mode == FG_NORMAL_MODE)):
- * when real_soc == 0, we must do report. But it will generate too much android
- * info when we enter test_power mode without battery, so we add a fg_drv_mode
- * ajudgement.
+ * cccv and finish switch all the time will cause dsoc freeze,
+ * if so, do finish chrg, 100ma is less than min finish_ma.
  */
-static void report_power_supply_changed(struct battery_info *di)
-{
-       static u32 old_soc;
-       static u32 old_ac_status;
-       static u32 old_usb_status;
-       static u32 old_charge_status;
-       bool state_changed;
-
-       state_changed = false;
-       if ((di->real_soc == 0) && (di->fg_drv_mode == FG_NORMAL_MODE))
-               state_changed = true;
-       else if (di->real_soc != old_soc)
-               state_changed = true;
-       else if (di->ac_online != old_ac_status)
-               state_changed = true;
-       else if (di->usb_online != old_usb_status)
-               state_changed = true;
-       else if (old_charge_status != di->status)
-               state_changed = true;
-
-       if (state_changed) {
-               power_supply_changed(&di->bat);
-               power_supply_changed(&di->usb);
-               power_supply_changed(&di->ac);
-               old_soc = di->real_soc;
-               old_ac_status = di->ac_online;
-               old_usb_status = di->usb_online;
-               old_charge_status = di->status;
-               DBG("<%s>. report: dsoc=%d, rsoc=%d\n",
-                   __func__, di->real_soc, di->temp_soc);
-       }
-}
-
-static void upd_time_table(struct battery_info *di)
+static bool rk818_bat_fake_finish_mode(struct rk818_battery *di)
 {
-       u8 i;
-       static int old_index;
-       static int old_min;
-       u32 time;
-       int mod = di->real_soc % 10;
-       int index = di->real_soc / 10;
-
-       if (di->ac_online == ONLINE || di->usb_online == ONLINE)
-               time = di->charge_min;
+       if ((di->rsoc == 100) && (rk818_bat_get_chrg_status(di) == CC_OR_CV) &&
+           (abs(di->current_avg) <= 100))
+               return true;
        else
-               time = di->discharge_min;
-
-       if ((mod == 0) && (index > 0) && (old_index != index)) {
-               di->chrg_min[index-1] = time - old_min;
-               old_min = time;
-               old_index = index;
-       }
-
-       for (i = 1; i < 11; i++)
-               DBG("Time[%d]=%d, ", (i*10), di->chrg_min[i-1]);
-       DBG("\n");
+               return false;
 }
 
-/*
- * there is a timer inside rk81x to calc how long the battery is in charging
- * state. rk81x will close PowerPath inside IC when timer reach, which will
- * stop the charging work. we have to reset the corresponding bits to restart
- * the timer to avoid that case.
- */
-static void rk81x_init_chrg_timer(struct battery_info *di)
+static void rk818_bat_display_smooth(struct rk818_battery *di)
 {
-       u8 buf;
+       /* discharge: reinit "zero & smooth" algorithm to avoid handling dsoc */
+       if (di->s2r && !di->sleep_chrg_online) {
+               DBG("s2r: discharge, reset algorithm...\n");
+               di->s2r = false;
+               rk818_bat_zero_algo_prepare(di);
+               rk818_bat_smooth_algo_prepare(di);
+               return;
+       }
 
-       battery_read(di->rk818, CHRG_CTRL_REG3, &buf, 1);
-       buf &= ~(0x4);
-       battery_write(di->rk818, CHRG_CTRL_REG3, &buf, 1);
-       battery_read(di->rk818, CHRG_CTRL_REG3, &buf, 1);
-       DBG("%s: clr: CHRG_CTRL_REG3<2> = 0x%x", __func__, buf);
-       buf |= 0x04;
-       battery_write(di->rk818, CHRG_CTRL_REG3, &buf, 1);
+       if (di->work_mode == MODE_FINISH) {
+               DBG("step1: charge finish...\n");
+               rk818_bat_finish_algorithm(di);
+               if ((rk818_bat_get_chrg_status(di) != CHARGE_FINISH) &&
+                   !rk818_bat_fake_finish_mode(di)) {
+                       if ((di->current_avg < 0) &&
+                           (di->voltage_avg < di->pdata->zero_algorithm_vol)) {
+                               DBG("step1: change to zero mode...\n");
+                               rk818_bat_zero_algo_prepare(di);
+                               di->work_mode = MODE_ZERO;
+                       } else {
+                               DBG("step1: change to smooth mode...\n");
+                               rk818_bat_smooth_algo_prepare(di);
+                               di->work_mode = MODE_SMOOTH;
+                       }
+               }
+       } else if (di->work_mode == MODE_ZERO) {
+               DBG("step2: zero algorithm...\n");
+               rk818_bat_zero_algorithm(di);
+               if ((di->voltage_avg >= di->pdata->zero_algorithm_vol + 50) ||
+                   (di->current_avg >= 0)) {
+                       DBG("step2: change to smooth mode...\n");
+                       rk818_bat_smooth_algo_prepare(di);
+                       di->work_mode = MODE_SMOOTH;
+               } else if ((rk818_bat_get_chrg_status(di) == CHARGE_FINISH) ||
+                          rk818_bat_fake_finish_mode(di)) {
+                       DBG("step2: change to finish mode...\n");
+                       rk818_bat_finish_algo_prepare(di);
+                       di->work_mode = MODE_FINISH;
+               }
+       } else {
+               DBG("step3: smooth algorithm...\n");
+               rk818_bat_smooth_algorithm(di);
+               if ((di->current_avg < 0) &&
+                   (di->voltage_avg < di->pdata->zero_algorithm_vol)) {
+                       DBG("step3: change to zero mode...\n");
+                       rk818_bat_zero_algo_prepare(di);
+                       di->work_mode = MODE_ZERO;
+               } else if ((rk818_bat_get_chrg_status(di) == CHARGE_FINISH) ||
+                          rk818_bat_fake_finish_mode(di)) {
+                       DBG("step3: change to finish mode...\n");
+                       rk818_bat_finish_algo_prepare(di);
+                       di->work_mode = MODE_FINISH;
+               }
+       }
 }
 
-static u8 get_cvcc_charge_hour(struct battery_info *di)
+static void rk818_bat_relax_vol_calib(struct rk818_battery *di)
 {
-       u8 hour, buf;
+       int soc, cap, vol;
 
-       battery_read(di->rk818, CHRG_CTRL_REG2, &buf, 1);
-       hour = buf & 0x07;
-
-       return CHG_CVCC_HOUR[hour];
+       vol = di->voltage_relax;
+       soc = rk818_bat_vol_to_ocvsoc(di, vol);
+       cap = rk818_bat_vol_to_ocvcap(di, vol);
+       rk818_bat_init_capacity(di, cap);
+       BAT_INFO("sleep ocv calib: rsoc=%d, cap=%d\n", soc, cap);
 }
 
-/* we have to estimate the charging finish time from now, to decide
- * whether we should reset the timer or not.
- */
-static void rk81x_check_chrg_over_time(struct battery_info *di)
+static void rk818_bat_relife_age_flag(struct rk818_battery *di)
 {
-       u8 cvcc_hour;
+       u8 ocv_soc, ocv_cap, soc_level;
 
-       cvcc_hour = get_cvcc_charge_hour(di);
-       DBG("CHG_TIME(min): %ld, cvcc hour: %d",
-           BASE_TO_MIN(di->chrg_time_base), cvcc_hour);
+       if (di->voltage_relax <= 0)
+               return;
 
-       if (BASE_TO_MIN(di->chrg_time_base) >= (cvcc_hour-2)*60) {
-               di->chrg_cap2_full = di->fcc - di->remain_capacity;
-               if (di->current_avg <= 0)
-                       di->current_avg = 1;
+       ocv_soc = rk818_bat_vol_to_ocvsoc(di, di->voltage_relax);
+       ocv_cap = rk818_bat_vol_to_ocvcap(di, di->voltage_relax);
+       DBG("<%s>. ocv_soc=%d, min=%lu, vol=%d\n", __func__,
+           ocv_soc, di->sleep_dischrg_sec / 60, di->voltage_relax);
+
+       /* sleep enough time and ocv_soc enough low */
+       if (!di->age_allow_update && ocv_soc <= 10) {
+               di->age_voltage = di->voltage_relax;
+               di->age_ocv_cap = ocv_cap;
+               di->age_ocv_soc = ocv_soc;
+               di->age_adjust_cap = 0;
+
+               if (ocv_soc <= 1)
+                       di->age_level = 100;
+               else if (ocv_soc < 5)
+                       di->age_level = 90;
+               else
+                       di->age_level = 80;
 
-               di->chrg_time2_full = di->chrg_cap2_full*3600/
-                                       div(abs_int(di->current_avg));
+               soc_level = rk818_bat_get_age_level(di);
+               if (soc_level > di->age_level) {
+                       di->age_allow_update = false;
+               } else {
+                       di->age_allow_update = true;
+                       di->age_keep_sec = get_boot_sec();
+               }
 
-               DBG("CHG_TIME2FULL(min):%d, chrg_cap2_full=%d, current=%d\n",
-                   SEC_TO_MIN(di->chrg_time2_full), di->chrg_cap2_full,
-                   di->current_avg);
+               BAT_INFO("resume: age_vol:%d, age_ocv_cap:%d, age_ocv_soc:%d, "
+                        "soc_level:%d, age_allow_update:%d, "
+                        "age_level:%d\n",
+                        di->age_voltage, di->age_ocv_cap, ocv_soc, soc_level,
+                        di->age_allow_update, di->age_level);
+       }
+}
+
+static int rk818_bat_sleep_dischrg(struct rk818_battery *di)
+{
+       bool ocv_soc_updated = false;
+       int tgt_dsoc, gap_soc, sleep_soc = 0;
+       int pwroff_vol = di->pdata->pwroff_vol;
+       unsigned long sleep_sec = di->sleep_dischrg_sec;
+
+       DBG("<%s>. enter: dsoc=%d, rsoc=%d, rv=%d, v=%d, sleep_min=%lu\n",
+           __func__, di->dsoc, di->rsoc, di->voltage_relax,
+           di->voltage_avg, sleep_sec / 60);
+
+       if (di->voltage_relax >= di->voltage_avg) {
+               rk818_bat_relax_vol_calib(di);
+               rk818_bat_restart_relax(di);
+               rk818_bat_relife_age_flag(di);
+               ocv_soc_updated = true;
+       }
+
+       /* handle dsoc */
+       if (di->dsoc <= di->rsoc) {
+               di->sleep_sum_cap = (SLP_CURR_MIN * sleep_sec / 3600);
+               sleep_soc = di->sleep_sum_cap * 100 / DIV(di->fcc);
+               tgt_dsoc = di->dsoc - sleep_soc;
+               if (sleep_soc > 0) {
+                       BAT_INFO("calib0: rl=%d, dl=%d, intval=%d\n",
+                                di->rsoc, di->dsoc, sleep_soc);
+                       if (di->dsoc < 5) {
+                               di->dsoc--;
+                       } else if ((tgt_dsoc < 5) && (di->dsoc >= 5)) {
+                               if (di->dsoc == 5)
+                                       di->dsoc--;
+                               else
+                                       di->dsoc = 5;
+                       } else if (tgt_dsoc > 5) {
+                               di->dsoc = tgt_dsoc;
+                       }
+               }
 
-               if (SEC_TO_MIN(di->chrg_time2_full) > 60) {
-                       rk81x_init_chrg_timer(di);
-                       di->chrg_time_base = get_seconds();
-                       DBG("%s: reset charge timer\n", __func__);
+               DBG("%s: dsoc<=rsoc, sum_cap=%d==>sleep_soc=%d, tgt_dsoc=%d\n",
+                   __func__, di->sleep_sum_cap, sleep_soc, tgt_dsoc);
+       } else {
+               /* di->dsoc > di->rsoc */
+               di->sleep_sum_cap = (SLP_CURR_MAX * sleep_sec / 3600);
+               sleep_soc = di->sleep_sum_cap / DIV(di->fcc / 100);
+               gap_soc = di->dsoc - di->rsoc;
+
+               BAT_INFO("calib1: rsoc=%d, dsoc=%d, intval=%d\n",
+                        di->rsoc, di->dsoc, sleep_soc);
+               if (gap_soc > sleep_soc) {
+                       if ((gap_soc - 5) > (sleep_soc * 2))
+                               di->dsoc -= (sleep_soc * 2);
+                       else
+                               di->dsoc -= sleep_soc;
+               } else {
+                       di->dsoc = di->rsoc;
                }
+
+               DBG("%s: dsoc>rsoc, sum_cap=%d=>sleep_soc=%d, gap_soc=%d\n",
+                   __func__, di->sleep_sum_cap, sleep_soc, gap_soc);
        }
-}
 
-/*
- * in case that we will do reboot stress test, we need a special way
- * to ajust the dsoc.
- */
-static void rk81x_check_reboot(struct battery_info *di)
-{
-       u8 rsoc = di->temp_soc;
-       u8 dsoc = di->real_soc;
-       u8 status = di->status;
-       u8 cnt;
-       int unit_time;
-       int smooth_time;
+       if (di->voltage_avg <= pwroff_vol - 70) {
+               di->dsoc = 0;
+               rk_send_wakeup_key();
+               BAT_INFO("low power sleeping, shutdown... %d\n", di->dsoc);
+       }
 
-       battery_read(di->rk818, REBOOT_CNT_REG, &cnt, 1);
-       cnt++;
+       if (ocv_soc_updated && sleep_soc && (di->rsoc - di->dsoc) < 5 &&
+           di->dsoc < 40) {
+               di->dsoc--;
+               BAT_INFO("low power sleeping, reserved... %d\n", di->dsoc);
+       }
 
-       unit_time = di->fcc*3600/100/1200;/*1200mA default*/
-       smooth_time = cnt*BASE_TO_SEC(di->sys_on_base);
-
-       DBG("%s: cnt:%d, unit:%d, sm:%d, sec:%lu, dsoc:%d, rsoc:%d\n",
-           __func__, cnt, unit_time, smooth_time,
-           BASE_TO_SEC(di->sys_on_base), dsoc, rsoc);
-
-       if (((status == POWER_SUPPLY_STATUS_CHARGING) ||
-            (status == POWER_SUPPLY_STATUS_FULL)) && (di->current_avg > 0)) {
-               DBG("chrg, sm:%d, aim:%d\n", smooth_time, unit_time*3/5);
-               if ((dsoc < rsoc-1) && (smooth_time > unit_time*3/5)) {
-                       cnt = 0;
-                       dsoc++;
-                       if (dsoc >= 100)
-                               dsoc = 100;
-                       _copy_soc(di, dsoc);
-               }
-       } else {/*status == POWER_SUPPLY_STATUS_DISCHARGING*/
-
-               DBG("dischrg, sm:%d, aim:%d\n", smooth_time, unit_time*3/5);
-               if ((dsoc > rsoc) && (smooth_time > unit_time*3/5)) {
-                       cnt = 0;
-                       dsoc--;
-                       if (dsoc <= 0)
-                               dsoc = 0;
-                       _copy_soc(di, dsoc);
-               }
+       if (di->dsoc <= 0) {
+               di->dsoc = 0;
+               rk_send_wakeup_key();
+               BAT_INFO("sleep dsoc is %d...\n", di->dsoc);
        }
 
-       copy_reboot_cnt(di, cnt);
-}
+       DBG("<%s>. out: dsoc=%d, rsoc=%d, sum_cap=%d\n",
+           __func__, di->dsoc, di->rsoc, di->sleep_sum_cap);
 
+       return sleep_soc;
+}
 
-static void rk81x_update_battery_info(struct battery_info *di)
+static void rk818_bat_power_supply_changed(struct rk818_battery *di)
 {
-       int round_off_dsoc;
+       u8 status;
+       static int old_soc = -1;
 
-       di->remain_capacity = _get_realtime_capacity(di);
-       if (di->remain_capacity > di->fcc)
-               _capacity_init(di, di->fcc);
+       if (di->dsoc > 100)
+               di->dsoc = 100;
+       else if (di->dsoc < 0)
+               di->dsoc = 0;
+
+       if (di->dsoc == old_soc)
+               return;
 
-       if (di->real_soc > 100)
-               di->real_soc = 100;
-       else if (di->real_soc < 0)
-               di->real_soc = 0;
+       status = rk818_bat_read(di, RK818_SUP_STS_REG);
+       status = (status & CHRG_STATUS_MSK) >> 4;
+       old_soc = di->dsoc;
+       di->last_dsoc = di->dsoc;
+       power_supply_changed(di->bat);
+       BAT_INFO("changed: dsoc=%d, rsoc=%d, v=%d, ov=%d c=%d, "
+                "cap=%d, f=%d, st=%s\n",
+                di->dsoc, di->rsoc, di->voltage_avg, di->voltage_ocv,
+                di->current_avg, di->remain_cap, di->fcc, bat_status[status]);
 
-       if (di->chrg_time_base == 0)
-               di->chrg_time_base = get_seconds();
+       BAT_INFO("dl=%d, rl=%d, v=%d, halt=%d, halt_n=%d, max=%d, "
+                "init=%d, sw=%d, calib=%d, below0=%d, force=%d\n",
+                di->dbg_pwr_dsoc, di->dbg_pwr_rsoc, di->dbg_pwr_vol,
+                di->is_halt, di->halt_cnt, di->is_max_soc_offset,
+                di->is_initialized, di->is_sw_reset, di->is_ocv_calib,
+                di->dbg_cap_low0, di->is_force_calib);
+}
 
-       if (di->sys_on_base == 0)
-               di->sys_on_base = get_seconds();
+static u8 rk818_bat_check_reboot(struct rk818_battery *di)
+{
+       u8 cnt;
 
-       if (di->status == POWER_SUPPLY_STATUS_DISCHARGING) {
-               di->chrg_time_base = get_seconds();
+       cnt = rk818_bat_read(di, RK818_REBOOT_CNT_REG);
+       cnt++;
 
-               /*round off dsoc = 100*/
-               round_off_dsoc = (di->remain_capacity+di->fcc/100/2)*
-                                       100/div(di->fcc);
-               if (round_off_dsoc >= 100 && di->real_soc >= 99)
-                       di->real_soc = 100;
-               DBG("<%s>. round_off_dsoc = %d", __func__, round_off_dsoc);
+       if (cnt >= REBOOT_MAX_CNT) {
+               BAT_INFO("reboot: %d --> %d\n", di->dsoc, di->rsoc);
+               di->dsoc = di->rsoc;
+               if (di->dsoc > 100)
+                       di->dsoc = 100;
+               else if (di->dsoc < 0)
+                       di->dsoc = 0;
+               rk818_bat_save_dsoc(di, di->dsoc);
+               cnt = REBOOT_MAX_CNT;
+       }
+
+       rk818_bat_save_reboot_cnt(di, cnt);
+       DBG("reboot cnt: %d\n", cnt);
+
+       return cnt;
+}
+
+static void rk818_bat_rsoc_daemon(struct rk818_battery *di)
+{
+       int est_vol, remain_cap;
+       static unsigned long sec;
+
+       if ((di->remain_cap < 0) && (di->fb_blank != 0)) {
+               if (!sec)
+                       sec = get_boot_sec();
+               wake_lock_timeout(&di->wake_lock,
+                                 (di->pdata->monitor_sec + 1) * HZ);
+
+               DBG("sec=%ld, hold_sec=%ld\n", sec, base2sec(sec));
+               if (base2sec(sec) >= 60) {
+                       sec = 0;
+                       di->dbg_cap_low0++;
+                       est_vol = di->voltage_avg -
+                                       (di->bat_res * di->current_avg) / 1000;
+                       remain_cap = rk818_bat_vol_to_ocvcap(di, est_vol);
+                       rk818_bat_init_capacity(di, remain_cap);
+                       BAT_INFO("adjust cap below 0 --> %d, rsoc=%d\n",
+                                di->remain_cap, di->rsoc);
+                       wake_unlock(&di->wake_lock);
+               }
+       } else {
+               sec = 0;
        }
-
-       di->work_on = 1;
-       di->voltage  = _get_battery_voltage(di);
-       di->current_avg = _get_average_current(di);
-       di->remain_capacity = _get_realtime_capacity(di);
-       di->voltage_ocv = _get_OCV_voltage(di);
-       di->charge_status = rk81x_get_charge_status(di);
-       di->relax_voltage = get_relax_voltage(di);
-       di->temp_soc = _get_soc(di);
-       di->est_ocv_vol = estimate_bat_ocv_vol(di);
-       di->est_ocv_soc = estimate_bat_ocv_soc(di);
-       rk81x_check_battery_status(di);/* ac_online, usb_online, status*/
-       rk81x_check_chrg_over_time(di);
-       update_cal_offset(di);
 }
 
-static void rk81x_battery_work(struct work_struct *work)
+static void rk818_bat_update_info(struct rk818_battery *di)
 {
-       struct battery_info *di = container_of(work,
-                       struct battery_info, battery_monitor_work.work);
+       di->voltage_avg = rk818_bat_get_avg_voltage(di);
+       di->current_avg = rk818_bat_get_avg_current(di);
+       di->voltage_relax = rk818_bat_get_relax_voltage(di);
+       di->rsoc = rk818_bat_get_rsoc(di);
+       di->remain_cap = rk818_bat_get_coulomb_cap(di);
+       di->chrg_status = rk818_bat_get_chrg_status(di);
+
+       /* smooth charge */
+       if (di->remain_cap > di->fcc) {
+               di->sm_remain_cap -= (di->remain_cap - di->fcc);
+               DBG("<%s>. cap: remain=%d, sm_remain=%d\n",
+                   __func__, di->remain_cap, di->sm_remain_cap);
+               rk818_bat_init_coulomb_cap(di, di->fcc);
+       }
 
-       update_resume_state(di);
-       wait_charge_finish_signal(di);
-       charge_finish_routine(di);
+       if (di->chrg_status != CHARGE_FINISH)
+               di->finish_base = get_boot_sec();
 
-       rk81x_battery_display_smooth(di);
-       rk81x_update_battery_info(di);
-       rsoc_realtime_calib(di);
-       last_check_report(di);
-       report_power_supply_changed(di);
-       _copy_soc(di, di->real_soc);
-       _save_remain_capacity(di, di->remain_capacity);
+       /*
+        * we need update fcc in continuous charging state, if discharge state
+        * keep at least 2 hour, we decide not to update fcc, so clear the
+        * fcc update flag: age_allow_update.
+        */
+       if (base2min(di->plug_out_base) > 120)
+               di->age_allow_update = false;
 
-       dump_debug_info(di);
-       di->queue_work_cnt++;
-       queue_delayed_work(di->wq, &di->battery_monitor_work,
-                          msecs_to_jiffies(TIMER_MS_COUNTS));
+       /* do adc calib: status must from cccv mode to finish mode */
+       if (di->chrg_status == CC_OR_CV) {
+               di->adc_allow_update = true;
+               di->adc_calib_cnt = 0;
+       }
 }
 
-static void rk81x_battery_charge_check_work(struct work_struct *work)
+/* get ntc resistance */
+static int rk818_bat_get_ntc_res(struct rk818_battery *di)
 {
-       struct battery_info *di = container_of(work,
-                       struct battery_info, charge_check_work.work);
+       int val = 0;
 
-       DBG("rk81x_battery_charge_check_work\n");
-       charge_disable_open_otg(di->charge_otg);
-}
+       val |= rk818_bat_read(di, RK818_TS1_ADC_REGL) << 0;
+       val |= rk818_bat_read(di, RK818_TS1_ADC_REGH) << 8;
 
-static BLOCKING_NOTIFIER_HEAD(battery_chain_head);
+       val = val * NTC_CALC_FACTOR; /*reference voltage 2.2V,current 80ua*/
+       DBG("<%s>. ntc_res=%d\n", __func__, val);
 
-int register_battery_notifier(struct notifier_block *nb)
-{
-       return blocking_notifier_chain_register(&battery_chain_head, nb);
+       return val;
 }
-EXPORT_SYMBOL_GPL(register_battery_notifier);
 
-int unregister_battery_notifier(struct notifier_block *nb)
+static void rk818_bat_update_temperature(struct rk818_battery *di)
 {
-       return blocking_notifier_chain_unregister(&battery_chain_head, nb);
-}
-EXPORT_SYMBOL_GPL(unregister_battery_notifier);
+       u32 ntc_size, *ntc_table;
+       int i, res;
 
-int battery_notifier_call_chain(unsigned long val)
-{
-       return (blocking_notifier_call_chain(&battery_chain_head, val, NULL)
-               == NOTIFY_BAD) ? -EINVAL : 0;
-}
-EXPORT_SYMBOL_GPL(battery_notifier_call_chain);
+       ntc_table = di->pdata->ntc_table;
+       ntc_size = di->pdata->ntc_size;
+       di->temperature = VIRTUAL_TEMPERATURE;
 
-static void poweron_lowerpoer_handle(struct battery_info *di)
-{
-#ifdef CONFIG_LOGO_LOWERPOWER_WARNING
-       if ((di->real_soc <= 2) &&
-           (di->status == POWER_SUPPLY_STATUS_DISCHARGING)) {
-               mdelay(1500);
-               /* kernel_power_off(); */
+       if (ntc_size) {
+               res = rk818_bat_get_ntc_res(di);
+               if (res < ntc_table[ntc_size - 1]) {
+                       BAT_INFO("bat ntc upper max degree: R=%d\n", res);
+               } else if (res > ntc_table[0]) {
+                       BAT_INFO("bat ntc lower min degree: R=%d\n", res);
+               } else {
+                       for (i = 0; i < ntc_size; i++) {
+                               if (res >= ntc_table[i])
+                                       break;
+                       }
+                       di->temperature = (i + di->pdata->ntc_degree_from) * 10;
+               }
        }
-#endif
 }
 
-static int battery_notifier_call(struct notifier_block *nb,
-                                unsigned long event, void *data)
+static void rk818_bat_init_dsoc_algorithm(struct rk818_battery *di)
 {
-       struct battery_info *di =
-           container_of(nb, struct battery_info, battery_nb);
-
-       switch (event) {
-       case 0:
-               DBG(" CHARGE enable\n");
-               di->charge_otg = 0;
-               queue_delayed_work(di->wq, &di->charge_check_work,
-                                  msecs_to_jiffies(50));
-               break;
+       u8 buf;
+       int16_t rest = 0;
+       unsigned long soc_sec;
+       const char *mode_name[] = { "MODE_ZERO", "MODE_FINISH",
+               "MODE_SMOOTH_CHRG", "MODE_SMOOTH_DISCHRG", "MODE_SMOOTH", };
+
+       /* get rest */
+       rest |= rk818_bat_read(di, RK818_CALC_REST_REGH) << 8;
+       rest |= rk818_bat_read(di, RK818_CALC_REST_REGL) << 0;
+
+       /* get mode */
+       buf = rk818_bat_read(di, RK818_MISC_MARK_REG);
+       di->algo_rest_mode = (buf & ALGO_REST_MODE_MSK) >> ALGO_REST_MODE_SHIFT;
+
+       if (rk818_bat_get_chrg_status(di) == CHARGE_FINISH) {
+               if (di->algo_rest_mode == MODE_FINISH) {
+                       soc_sec = di->fcc * 3600 / 100 / FINISH_CHRG_CUR1;
+                       if ((rest / DIV(soc_sec)) > 0) {
+                               if (di->dsoc < 100) {
+                                       di->dsoc++;
+                                       di->algo_rest_val = rest % soc_sec;
+                                       BAT_INFO("algorithm rest(%d) dsoc "
+                                                "inc: %d\n",
+                                                rest, di->dsoc);
+                               } else {
+                                       di->algo_rest_val = 0;
+                               }
+                       } else {
+                               di->algo_rest_val = rest;
+                       }
+               } else {
+                       di->algo_rest_val = rest;
+               }
+       } else {
+               /* charge speed up */
+               if ((rest / 1000) > 0 && rk818_bat_chrg_online(di)) {
+                       if (di->dsoc < di->rsoc) {
+                               di->dsoc++;
+                               di->algo_rest_val = rest % 1000;
+                               BAT_INFO("algorithm rest(%d) dsoc inc: %d\n",
+                                        rest, di->dsoc);
+                       } else {
+                               di->algo_rest_val = 0;
+                       }
+               /* discharge speed up */
+               } else if (((rest / 1000) < 0) && !rk818_bat_chrg_online(di)) {
+                       if (di->dsoc > di->rsoc) {
+                               di->dsoc--;
+                               di->algo_rest_val = rest % 1000;
+                               BAT_INFO("algorithm rest(%d) dsoc sub: %d\n",
+                                        rest, di->dsoc);
+                       } else {
+                               di->algo_rest_val = 0;
+                       }
+               } else {
+                       di->algo_rest_val = rest;
+               }
+       }
 
-       case 1:
-               di->charge_otg  = 1;
-               queue_delayed_work(di->wq, &di->charge_check_work,
-                                  msecs_to_jiffies(50));
-               DBG("charge disable OTG enable\n");
-               break;
+       if (di->dsoc >= 100)
+               di->dsoc = 100;
+       else if (di->dsoc <= 0)
+               di->dsoc = 0;
 
-       case 2:
-               poweron_lowerpoer_handle(di);
-               break;
+       /* init current mode */
+       di->voltage_avg = rk818_bat_get_avg_voltage(di);
+       di->current_avg = rk818_bat_get_avg_current(di);
+       if (rk818_bat_get_chrg_status(di) == CHARGE_FINISH) {
+               rk818_bat_finish_algo_prepare(di);
+               di->work_mode = MODE_FINISH;
+       } else {
+               rk818_bat_smooth_algo_prepare(di);
+               di->work_mode = MODE_SMOOTH;
+       }
+
+       DBG("<%s>. init: org_rest=%d, rest=%d, mode=%s; "
+           "doc(x1000): zero=%d, chrg=%d, dischrg=%d, finish=%lu\n",
+           __func__, rest, di->algo_rest_val, mode_name[di->algo_rest_mode],
+           di->zero_dsoc, di->sm_chrg_dsoc, di->sm_dischrg_dsoc,
+           di->finish_base);
+}
+
+static void rk818_bat_save_algo_rest(struct rk818_battery *di)
+{
+       u8 buf, mode;
+       int16_t algo_rest = 0;
+       int tmp_soc;
+       int zero_rest = 0, sm_chrg_rest = 0;
+       int sm_dischrg_rest = 0, finish_rest = 0;
+       const char *mode_name[] = { "MODE_ZERO", "MODE_FINISH",
+               "MODE_SMOOTH_CHRG", "MODE_SMOOTH_DISCHRG", "MODE_SMOOTH", };
+
+       /* zero dischrg */
+       tmp_soc = (di->zero_dsoc) / 1000;
+       if (tmp_soc == di->dsoc)
+               zero_rest = di->zero_dsoc - ((di->dsoc + 1) * 1000 -
+                               MIN_ACCURACY);
+
+       /* sm chrg */
+       tmp_soc = di->sm_chrg_dsoc / 1000;
+       if (tmp_soc == di->dsoc)
+               sm_chrg_rest = di->sm_chrg_dsoc - di->dsoc * 1000;
+
+       /* sm dischrg */
+       tmp_soc = (di->sm_dischrg_dsoc) / 1000;
+       if (tmp_soc == di->dsoc)
+               sm_dischrg_rest = di->sm_dischrg_dsoc - ((di->dsoc + 1) * 1000 -
+                               MIN_ACCURACY);
+
+       /* last time is also finish chrg, then add last rest */
+       if (di->algo_rest_mode == MODE_FINISH && di->algo_rest_val)
+               finish_rest = base2sec(di->finish_base) + di->algo_rest_val;
+       else
+               finish_rest = base2sec(di->finish_base);
+
+       /* total calc */
+       if ((rk818_bat_chrg_online(di) && (di->dsoc > di->rsoc)) ||
+           (!rk818_bat_chrg_online(di) && (di->dsoc < di->rsoc)) ||
+           (di->dsoc == di->rsoc)) {
+               di->algo_rest_val = 0;
+               algo_rest = 0;
+               DBG("<%s>. step1..\n", __func__);
+       } else if (di->work_mode == MODE_FINISH) {
+               algo_rest = finish_rest;
+               DBG("<%s>. step2..\n", __func__);
+       } else if (di->algo_rest_mode == MODE_FINISH) {
+               algo_rest = zero_rest + sm_dischrg_rest + sm_chrg_rest;
+               DBG("<%s>. step3..\n", __func__);
+       } else {
+               if (rk818_bat_chrg_online(di) && (di->dsoc < di->rsoc))
+                       algo_rest = sm_chrg_rest + di->algo_rest_val;
+               else if (!rk818_bat_chrg_online(di) && (di->dsoc > di->rsoc))
+                       algo_rest = zero_rest + sm_dischrg_rest +
+                                   di->algo_rest_val;
+               else
+                       algo_rest = zero_rest + sm_dischrg_rest + sm_chrg_rest +
+                                   di->algo_rest_val;
+               DBG("<%s>. step4..\n", __func__);
+       }
 
-       default:
-               return NOTIFY_OK;
+       /* check mode */
+       if ((di->work_mode == MODE_FINISH) || (di->work_mode == MODE_ZERO)) {
+               mode = di->work_mode;
+       } else {/* MODE_SMOOTH */
+               if (di->sm_linek > 0)
+                       mode = MODE_SMOOTH_CHRG;
+               else
+                       mode = MODE_SMOOTH_DISCHRG;
        }
-       return NOTIFY_OK;
-}
 
-static irqreturn_t rk818_vbat_lo_irq(int irq, void *di)
-{
-       pr_info("<%s>lower power warning!\n", __func__);
+       /* save mode */
+       buf = rk818_bat_read(di, RK818_MISC_MARK_REG);
+       buf &= ~ALGO_REST_MODE_MSK;
+       buf |= (mode << ALGO_REST_MODE_SHIFT);
+       rk818_bat_write(di, RK818_MISC_MARK_REG, buf);
 
-       rk_send_wakeup_key();
-       kernel_power_off();
-       return IRQ_HANDLED;
-}
+       /* save rest */
+       buf = (algo_rest >> 8) & 0xff;
+       rk818_bat_write(di, RK818_CALC_REST_REGH, buf);
+       buf = (algo_rest >> 0) & 0xff;
+       rk818_bat_write(di, RK818_CALC_REST_REGL, buf);
 
-static void disable_vbat_low_irq(struct battery_info *di)
-{
-       /* mask vbat low */
-       rk818_set_bits(di->rk818, 0x4d, (0x1 << 1), (0x1 << 1));
-       /*clr vbat low interrupt */
-       /* rk818_set_bits(di->rk818, 0x4c, (0x1 << 1), (0x1 << 1));*/
+       DBG("<%s>. rest: algo=%d, mode=%s, last_rest=%d; zero=%d, "
+           "chrg=%d, dischrg=%d, finish=%lu\n",
+           __func__, algo_rest, mode_name[mode], di->algo_rest_val, zero_rest,
+           sm_chrg_rest, sm_dischrg_rest, base2sec(di->finish_base));
 }
-static void enable_vbat_low_irq(struct battery_info *di)
+
+static void rk818_bat_save_data(struct rk818_battery *di)
 {
-       /* clr vbat low interrupt */
-       rk818_set_bits(di->rk818, 0x4c, (0x1 << 1), (0x1 << 1));
-       /* mask vbat low */
-       rk818_set_bits(di->rk818, 0x4d, (0x1 << 1), (0x0 << 1));
+       rk818_bat_save_dsoc(di, di->dsoc);
+       rk818_bat_save_cap(di, di->remain_cap);
+       rk818_bat_save_algo_rest(di);
 }
 
-static irqreturn_t rk818_vbat_plug_in(int irq, void *di)
+static void rk818_battery_work(struct work_struct *work)
 {
-       pr_info("\n------- %s:irq = %d\n", __func__, irq);
-       g_battery->chrg_time_base = get_seconds();
-       rk_send_wakeup_key();
-       return IRQ_HANDLED;
+       struct rk818_battery *di =
+               container_of(work, struct rk818_battery, bat_delay_work.work);
+
+       rk818_bat_update_info(di);
+       rk818_bat_wait_finish_sig(di);
+       rk818_bat_rsoc_daemon(di);
+       rk818_bat_update_temperature(di);
+       rk818_bat_display_smooth(di);
+       rk818_bat_power_supply_changed(di);
+       rk818_bat_save_data(di);
+       rk818_bat_debug_info(di);
+
+       queue_delayed_work(di->bat_monitor_wq, &di->bat_delay_work,
+                          msecs_to_jiffies(di->monitor_ms));
 }
-static irqreturn_t rk818_vbat_plug_out(int irq, void  *di)
+
+static irqreturn_t rk818_vb_low_irq(int irq, void *bat)
 {
-       pr_info("\n-------- %s:irq = %d\n", __func__, irq);
-       charge_disable_open_otg(0);
+       struct rk818_battery *di = (struct rk818_battery *)bat;
+
+       di->dsoc = 0;
        rk_send_wakeup_key();
+       BAT_INFO("lower power yet, power off system! v=%d, c=%d, dsoc=%d\n",
+                di->voltage_avg, di->current_avg, di->dsoc);
+
        return IRQ_HANDLED;
 }
 
-static irqreturn_t rk818_vbat_charge_ok(int irq, void  *di)
+static void rk818_bat_init_sysfs(struct rk818_battery *di)
 {
-       pr_info("---------- %s:irq = %d\n", __func__, irq);
-       rk_send_wakeup_key();
-       return IRQ_HANDLED;
+       int i, ret;
+
+       for (i = 0; i < ARRAY_SIZE(rk818_bat_attr); i++) {
+               ret = sysfs_create_file(&di->dev->kobj,
+                                       &rk818_bat_attr[i].attr);
+               if (ret)
+                       dev_err(di->dev, "create bat node(%s) error\n",
+                               rk818_bat_attr[i].attr.name);
+       }
 }
 
-static int rk81x_battery_sysfs_init(struct battery_info *di, struct device *dev)
+static int rk818_bat_init_irqs(struct rk818_battery *di)
 {
-       int ret;
-       int i;
-       struct kobject *rk818_fg_kobj;
+       struct rk808 *rk818 = di->rk818;
+       struct platform_device *pdev = di->pdev;
+       int ret, vb_lo_irq;
 
-       ret = create_sysfs_interfaces(dev);
-       if (ret < 0) {
-               ret = -EINVAL;
-               dev_err(dev, "device RK818 battery sysfs register failed\n");
-               goto err_sysfs;
+       vb_lo_irq = regmap_irq_get_virq(rk818->irq_data, RK818_IRQ_VB_LO);
+       if (vb_lo_irq < 0) {
+               dev_err(di->dev, "vb_lo_irq request failed!\n");
+               return vb_lo_irq;
        }
 
-       rk818_fg_kobj = kobject_create_and_add("rk818_battery", NULL);
-       if (!rk818_fg_kobj)
-               return -ENOMEM;
-       for (i = 0; i < ARRAY_SIZE(rk818_bat_attr); i++) {
-               ret = sysfs_create_file(rk818_fg_kobj, &rk818_bat_attr[i].attr);
-               if (ret != 0) {
-                       dev_err(dev, "create rk818_battery node error\n");
-                       goto err_sysfs;
-               }
+       ret = devm_request_threaded_irq(di->dev, vb_lo_irq, NULL,
+                                       rk818_vb_low_irq, IRQF_TRIGGER_HIGH,
+                                       "rk818_vb_low", di);
+       if (ret) {
+               dev_err(&pdev->dev, "vb_lo_irq request failed!\n");
+               return ret;
        }
+       enable_irq_wake(vb_lo_irq);
 
-       return ret;
-
-err_sysfs:
-       power_supply_unregister(&di->ac);
-       power_supply_unregister(&di->usb);
-       power_supply_unregister(&di->bat);
-
-       return ret;
+       return 0;
 }
 
-static void rk81x_battery_irq_init(struct battery_info *di)
+static void rk818_bat_init_info(struct rk818_battery *di)
 {
-       int plug_in_irq, plug_out_irq, chg_ok_irq, vb_lo_irq;
-       int ret;
-       struct rk818 *chip = di->rk818;
-
-       vb_lo_irq = irq_create_mapping(chip->irq_domain, RK818_IRQ_VB_LO);
-       plug_in_irq = irq_create_mapping(chip->irq_domain, RK818_IRQ_PLUG_IN);
-       plug_out_irq = irq_create_mapping(chip->irq_domain, RK818_IRQ_PLUG_OUT);
-       chg_ok_irq = irq_create_mapping(chip->irq_domain, RK818_IRQ_CHG_OK);
-
-       ret = request_threaded_irq(vb_lo_irq, NULL, rk818_vbat_lo_irq,
-                                  IRQF_TRIGGER_HIGH, "rk818_vbatlow", chip);
-       if (ret != 0)
-               dev_err(chip->dev, "vb_lo_irq request failed!\n");
-
-       di->irq = vb_lo_irq;
-       enable_irq_wake(di->irq);
-       disable_vbat_low_irq(di);
+       di->design_cap = di->pdata->design_capacity;
+       di->qmax = di->pdata->design_qmax;
+       di->bat_res = di->pdata->bat_res;
+       di->monitor_ms = di->pdata->monitor_sec * TIMER_MS_COUNTS;
+       di->boot_base = POWER_ON_SEC_BASE;
+       di->res_div = (di->pdata->sample_res == SAMPLE_RES_20MR) ?
+                      SAMPLE_RES_DIV1 : SAMPLE_RES_DIV2;
+}
 
-       ret = request_threaded_irq(plug_in_irq, NULL, rk818_vbat_plug_in,
-                                  IRQF_TRIGGER_RISING, "rk818_vbat_plug_in",
-                                  chip);
-       if (ret != 0)
-               dev_err(chip->dev, "plug_in_irq request failed!\n");
+static int rk818_bat_rtc_sleep_sec(struct rk818_battery *di)
+{
+       int err;
+       int interval_sec = 0;
+       struct rtc_time tm;
+       struct timespec tv = { .tv_nsec = NSEC_PER_SEC >> 1, };
+       struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
 
+       err = rtc_read_time(rtc, &tm);
+       if (err) {
+               dev_err(rtc->dev.parent, "hctosys: read hardware clk failed\n");
+               return 0;
+       }
 
-       ret = request_threaded_irq(plug_out_irq, NULL, rk818_vbat_plug_out,
-                                  IRQF_TRIGGER_FALLING, "rk818_vbat_plug_out",
-                                  chip);
-       if (ret != 0)
-               dev_err(chip->dev, "plug_out_irq request failed!\n");
+       err = rtc_valid_tm(&tm);
+       if (err) {
+               dev_err(rtc->dev.parent, "hctosys: invalid date time\n");
+               return 0;
+       }
 
+       rtc_tm_to_time(&tm, &tv.tv_sec);
+       interval_sec = tv.tv_sec - di->rtc_base.tv_sec;
 
-       ret = request_threaded_irq(chg_ok_irq, NULL, rk818_vbat_charge_ok,
-                                  IRQF_TRIGGER_RISING, "rk818_vbat_charge_ok",
-                                  chip);
-       if (ret != 0)
-               dev_err(chip->dev, "chg_ok_irq request failed!\n");
+       return (interval_sec > 0) ? interval_sec : 0;
 }
 
-
-static void rk81x_battery_info_init(struct battery_info *di, struct rk818 *chip)
+static void rk818_bat_init_ts1_detect(struct rk818_battery *di)
 {
-       int fcc_capacity;
-       u8 i;
-
-       g_battery = di;
-       di->platform_data = chip->battery_data;
-       di->cell.config = di->platform_data->cell_cfg;
-       di->design_capacity = di->platform_data->cell_cfg->design_capacity;
-       di->qmax = di->platform_data->cell_cfg->design_qmax;
-       di->fcc = di->design_capacity;
-       di->vol_smooth_time = 0;
-       di->charge_smooth_time = 0;
-       di->charge_smooth_status = false;
-       di->sleep_status = 0;
-       di->work_on = 0;
-       di->sys_wakeup = true;
-       di->pcb_ioffset = 0;
-       di->pcb_ioffset_updated = false;
-       di->queue_work_cnt = 0;
-       di->update_k = 0;
-       di->voltage_old = 0;
-       di->display_soc = 0;
-       di->bat_res = 0;
-       di->resume = false;
-       di->sys_wakeup = true;
-       di->status = POWER_SUPPLY_STATUS_DISCHARGING;
-       di->finish_min = 0;
-       di->charge_min = 0;
-       di->discharge_min = 0;
-       di->charging_time = 0;
-       di->discharging_time = 0;
-       di->finish_time = 0;
-       di->q_dead = 0;
-       di->q_err = 0;
-       di->q_shtd = 0;
-       di->odd_capacity = 0;
-       di->bat_res = di->rk818->battery_data->sense_resistor_mohm;
-       di->term_chg_cnt = 0;
-       di->emu_chg_cnt = 0;
-       di->zero_cycle = 0;
-       di->chrg_time_base = 0;
-       di->sys_on_base = 0;
-       di->sum_suspend_cap = 0;
-       di->adjust_cap = 0;
-       di->first_on_cap = 0;
-       di->fg_drv_mode = FG_NORMAL_MODE;
-
-       for (i = 0; i < 10; i++)
-               di->chrg_min[i] = 0;
-
-       di->debug_finish_real_soc = 0;
-       di->debug_finish_temp_soc = 0;
-
-       fcc_capacity = _get_FCC_capacity(di);
-       if (fcc_capacity > 1000)
-               di->fcc = fcc_capacity;
-       else
-               di->fcc = di->design_capacity;
-}
-/*
-static struct of_device_id rk818_battery_of_match[] = {
-{ .compatible = "rk818_battery" },
-{ }
-};
+       u8 buf;
 
-MODULE_DEVICE_TABLE(of, rk818_battery_of_match);
-*/
+       if (!di->pdata->ntc_size)
+               return;
 
+       /* ADC_TS1_EN */
+       buf = rk818_bat_read(di, RK818_ADC_CTRL_REG);
+       buf |= ADC_TS1_EN;
+       rk818_bat_write(di, RK818_ADC_CTRL_REG, buf);
+}
 
-/*
- * dc_det_pullup_inside:
- *
- *  0:  thers is resistance in the pcb to pull the pin up;
- *  1:  there is no resistance in the pcb to pull the pin up.
- *     we have to use inside pullup resistance function,
- *      so we have to define pinctrl info in DTS and analyze it
- */
-static void rk81x_dc_det_init(struct battery_info *di,
-                             struct device_node *np)
+static void rk818_bat_set_shtd_vol(struct rk818_battery *di)
 {
-       struct device *dev = di->dev;
-       struct rk818 *rk818 = di->rk818;
-       enum of_gpio_flags flags;
-       int ret;
-
-       /*thers is resistance in the pcb to pull the pin up*/
-       if (!di->dc_det_pullup_inside)
-               goto out;
-
-       /*there is no resistance in the pcb to pull the pin up.*/
-       di->pinctrl = devm_pinctrl_get(rk818->dev);
-       if (IS_ERR(di->pinctrl)) {
-               dev_err(dev, "No pinctrl used!\n");
-               return;
-       }
+       u8 val;
 
-       /* lookup default state */
-       di->pins_default = pinctrl_lookup_state(di->pinctrl, "default");
-       if (IS_ERR(di->pins_default)) {
-               dev_err(dev, "No default pinctrl found!\n");
-       } else {
-               ret = pinctrl_select_state(di->pinctrl, di->pins_default);
-               if (ret < 0) {
-                       dev_err(dev, "Default pinctrl setting failed!\n");
-               } else {
-out:
-                       di->dc_det_pin = of_get_named_gpio_flags(np,
-                                               "dc_det_gpio", 0, &flags);
-                       if (di->dc_det_pin == -EPROBE_DEFER)
-                               dev_err(dev, "dc_det_gpio error\n");
-                       if (gpio_is_valid(di->dc_det_pin))
-                               di->dc_det_level =
-                                       (flags & OF_GPIO_ACTIVE_LOW) ?
-                                               RK818_DC_IN : RK818_DC_OUT;
-               }
-       }
+       /* set vbat lowest 3.0v shutdown */
+       val = rk818_bat_read(di, RK818_VB_MON_REG);
+       val &= ~(VBAT_LOW_VOL_MASK | VBAT_LOW_ACT_MASK);
+       val |= (RK818_VBAT_LOW_3V0 | EN_VABT_LOW_SHUT_DOWN);
+       rk818_bat_write(di, RK818_VB_MON_REG, val);
+
+       /* disable low irq */
+       rk818_bat_set_bits(di, RK818_INT_STS_MSK_REG1,
+                          VB_LOW_INT_EN, VB_LOW_INT_EN);
+}
+
+static void rk818_bat_init_fg(struct rk818_battery *di)
+{
+       rk818_bat_enable_gauge(di);
+       rk818_bat_init_voltage_kb(di);
+       rk818_bat_init_coffset(di);
+       rk818_bat_set_relax_sample(di);
+       rk818_bat_set_ioffset_sample(di);
+       rk818_bat_set_ocv_sample(di);
+       rk818_bat_init_ts1_detect(di);
+       rk818_bat_init_rsoc(di);
+       rk818_bat_init_coulomb_cap(di, di->nac);
+       rk818_bat_init_age_algorithm(di);
+       rk818_bat_init_chrg_config(di);
+       rk818_bat_set_shtd_vol(di);
+       rk818_bat_init_zero_table(di);
+       rk818_bat_init_caltimer(di);
+       rk818_bat_init_dsoc_algorithm(di);
+
+       di->voltage_avg = rk818_bat_get_avg_voltage(di);
+       di->voltage_ocv = rk818_bat_get_ocv_voltage(di);
+       di->voltage_relax = rk818_bat_get_relax_voltage(di);
+       di->current_avg = rk818_bat_get_avg_current(di);
+       di->remain_cap = rk818_bat_get_coulomb_cap(di);
+       di->dbg_pwr_dsoc = di->dsoc;
+       di->dbg_pwr_rsoc = di->rsoc;
+       di->dbg_pwr_vol = di->voltage_avg;
+
+       rk818_bat_dump_regs(di, 0x99, 0xee);
+       DBG("nac=%d cap=%d ov=%d v=%d rv=%d dl=%d rl=%d c=%d\n",
+           di->nac, di->remain_cap, di->voltage_ocv, di->voltage_avg,
+           di->voltage_relax, di->dsoc, di->rsoc, di->current_avg);
 }
 
 #ifdef CONFIG_OF
-static int rk81x_battery_parse_dt(struct battery_info *di)
-{
-       struct device_node *regs, *rk818_pmic_np, *test_np;
-       struct battery_platform_data *data;
-       struct cell_config *cell_cfg;
-       struct ocv_config *ocv_cfg;
-       struct property *prop;
-       struct rk818 *rk818 = di->rk818;
-       struct device *dev = di->dev;
+static int rk818_bat_parse_dt(struct rk818_battery *di)
+{
        u32 out_value;
        int length, ret;
+       size_t size;
+       struct device_node *np = di->dev->of_node;
+       struct battery_platform_data *pdata;
+       struct device *dev = di->dev;
 
-       rk818_pmic_np = of_node_get(rk818->dev->of_node);
-       if (!rk818_pmic_np) {
-               dev_err(dev, "could not find pmic sub-node\n");
-               return -EINVAL;
-       }
-
-       regs = of_find_node_by_name(rk818_pmic_np, "battery");
-       if (!regs) {
-               dev_err(dev, "battery node not found!\n");
-               return -EINVAL;
-       }
-
-       data = devm_kzalloc(rk818->dev, sizeof(*data), GFP_KERNEL);
-       if (!data) {
-               dev_err(dev, "kzalloc for battery_platform_data failed!\n");
-               return -ENOMEM;
-       }
-
-       cell_cfg = devm_kzalloc(rk818->dev, sizeof(*cell_cfg), GFP_KERNEL);
-       if (!cell_cfg) {
-               dev_err(dev, "kzalloc for cell_config failed!\n");
-               return -ENOMEM;
-       }
-       ocv_cfg = devm_kzalloc(rk818->dev, sizeof(*ocv_cfg), GFP_KERNEL);
-       if (!ocv_cfg) {
-               dev_err(dev, "kzalloc for ocv_config failed!\n");
+       pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+       if (!pdata)
                return -ENOMEM;
-       }
 
-       prop = of_find_property(regs, "ocv_table", &length);
-       if (!prop) {
+       di->pdata = pdata;
+       /* init default param */
+       pdata->bat_res = DEFAULT_BAT_RES;
+       pdata->monitor_sec = DEFAULT_MONITOR_SEC;
+       pdata->pwroff_vol = DEFAULT_PWROFF_VOL_THRESD;
+       pdata->sleep_exit_current = DEFAULT_SLP_EXIT_CUR;
+       pdata->sleep_enter_current = DEFAULT_SLP_ENTER_CUR;
+       pdata->bat_mode = MODE_BATTARY;
+       pdata->max_soc_offset = DEFAULT_MAX_SOC_OFFSET;
+       pdata->sample_res = DEFAULT_SAMPLE_RES;
+       pdata->energy_mode = DEFAULT_ENERGY_MODE;
+       pdata->fb_temp = DEFAULT_FB_TEMP;
+       pdata->zero_reserve_dsoc = DEFAULT_ZERO_RESERVE_DSOC;
+
+       /* parse necessary param */
+       if (!of_find_property(np, "ocv_table", &length)) {
                dev_err(dev, "ocv_table not found!\n");
                return -EINVAL;
        }
-       data->ocv_size = length / sizeof(u32);
-
-       if (data->ocv_size > 0) {
-               size_t size = sizeof(*data->battery_ocv) * data->ocv_size;
-
-               data->battery_ocv = devm_kzalloc(rk818->dev, size, GFP_KERNEL);
-               if (!data->battery_ocv) {
-                       dev_err(dev, "kzalloc for ocv_table failed!\n");
-                       return -ENOMEM;
-               }
-               ret = of_property_read_u32_array(regs, "ocv_table",
-                                                data->battery_ocv,
-                                                data->ocv_size);
-               if (ret < 0)
-                       return ret;
-       }
-
-       /******************** charger param  ****************************/
-       ret = of_property_read_u32(regs, "max_charge_currentmA", &out_value);
-       if (ret < 0) {
-               dev_err(dev, "max_charge_currentmA not found!\n");
-               out_value = DEFAULT_ICUR;
-       }
-       data->max_charger_currentmA = out_value;
 
-       ret = of_property_read_u32(regs, "max_charge_ilimitmA", &out_value);
-       if (ret < 0) {
-               dev_err(dev, "max_charger_ilimitmA not found!\n");
-               out_value = DEFAULT_ILMT;
+       pdata->ocv_size = length / sizeof(u32);
+       if (pdata->ocv_size <= 0) {
+               dev_err(dev, "invalid ocv table\n");
+               return -EINVAL;
        }
-       data->max_charger_ilimitmA = out_value;
 
-       ret = of_property_read_u32(regs, "bat_res", &out_value);
-       if (ret < 0) {
-               dev_err(dev, "bat_res not found!\n");
-               out_value = DEFAULT_BAT_RES;
-       }
-       data->sense_resistor_mohm = out_value;
+       size = sizeof(*pdata->ocv_table) * pdata->ocv_size;
+       pdata->ocv_table = devm_kzalloc(di->dev, size, GFP_KERNEL);
+       if (!pdata->ocv_table)
+               return -ENOMEM;
 
-       ret = of_property_read_u32(regs, "max_charge_voltagemV", &out_value);
-       if (ret < 0) {
-               dev_err(dev, "max_charge_voltagemV not found!\n");
-               out_value = DEFAULT_VLMT;
-       }
-       data->max_charger_voltagemV = out_value;
+       ret = of_property_read_u32_array(np, "ocv_table",
+                                        pdata->ocv_table,
+                                        pdata->ocv_size);
+       if (ret < 0)
+               return ret;
 
-       ret = of_property_read_u32(regs, "design_capacity", &out_value);
+       ret = of_property_read_u32(np, "design_capacity", &out_value);
        if (ret < 0) {
                dev_err(dev, "design_capacity not found!\n");
                return ret;
        }
-       cell_cfg->design_capacity  = out_value;
+       pdata->design_capacity = out_value;
 
-       ret = of_property_read_u32(regs, "design_qmax", &out_value);
+       ret = of_property_read_u32(np, "design_qmax", &out_value);
        if (ret < 0) {
                dev_err(dev, "design_qmax not found!\n");
                return ret;
        }
-       cell_cfg->design_qmax = out_value;
-
-       ret = of_property_read_u32(regs, "sleep_enter_current", &out_value);
+       pdata->design_qmax = out_value;
+       ret = of_property_read_u32(np, "max_chrg_voltage", &out_value);
        if (ret < 0) {
-               dev_err(dev, "sleep_enter_current not found!\n");
+               dev_err(dev, "max_chrg_voltage missing!\n");
                return ret;
        }
-       ocv_cfg->sleep_enter_current = out_value;
+       pdata->max_chrg_voltage = out_value;
+       if (out_value >= 4300)
+               pdata->zero_algorithm_vol = DEFAULT_ALGR_VOL_THRESD2;
+       else
+               pdata->zero_algorithm_vol = DEFAULT_ALGR_VOL_THRESD1;
 
-       ret = of_property_read_u32(regs, "sleep_exit_current", &out_value);
-       if (ret < 0) {
-               dev_err(dev, "sleep_exit_current not found!\n");
-               return ret;
-       }
-       ocv_cfg->sleep_exit_current = out_value;
+       ret = of_property_read_u32(np, "fb_temperature", &pdata->fb_temp);
+       if (ret < 0)
+               dev_err(dev, "fb_temperature missing!\n");
+
+       ret = of_property_read_u32(np, "sample_res", &pdata->sample_res);
+       if (ret < 0)
+               dev_err(dev, "sample_res missing!\n");
+
+       ret = of_property_read_u32(np, "energy_mode", &pdata->energy_mode);
+       if (ret < 0)
+               dev_err(dev, "energy_mode missing!\n");
+
+       ret = of_property_read_u32(np, "max_soc_offset",
+                                  &pdata->max_soc_offset);
+       if (ret < 0)
+               dev_err(dev, "max_soc_offset missing!\n");
+
+       ret = of_property_read_u32(np, "monitor_sec", &pdata->monitor_sec);
+       if (ret < 0)
+               dev_err(dev, "monitor_sec missing!\n");
+
+       ret = of_property_read_u32(np, "zero_algorithm_vol",
+                                  &pdata->zero_algorithm_vol);
+       if (ret < 0)
+               dev_err(dev, "zero_algorithm_vol missing!\n");
+
+       ret = of_property_read_u32(np, "zero_reserve_dsoc",
+                                 &pdata->zero_reserve_dsoc);
+
+       ret = of_property_read_u32(np, "virtual_power", &pdata->bat_mode);
+       if (ret < 0)
+               dev_err(dev, "virtual_power missing!\n");
+
+       ret = of_property_read_u32(np, "bat_res", &pdata->bat_res);
+       if (ret < 0)
+               dev_err(dev, "bat_res missing!\n");
+
+       ret = of_property_read_u32(np, "sleep_enter_current",
+                                  &pdata->sleep_enter_current);
+       if (ret < 0)
+               dev_err(dev, "sleep_enter_current missing!\n");
+
+       ret = of_property_read_u32(np, "sleep_exit_current",
+                                  &pdata->sleep_exit_current);
+       if (ret < 0)
+               dev_err(dev, "sleep_exit_current missing!\n");
 
-       /********************  test power param ****************************/
-       test_np = of_find_node_by_name(regs, "test_power");
-       if (!regs) {
-               dev_err(dev, "test-power node not found!\n");
-               di->test_chrg_current = DEF_TEST_CURRENT_MA;
-               di->test_chrg_ilmt = DEF_TEST_ILMT_MA;
+       ret = of_property_read_u32(np, "power_off_thresd", &pdata->pwroff_vol);
+       if (ret < 0)
+               dev_err(dev, "power_off_thresd missing!\n");
+
+       if (!of_find_property(np, "ntc_table", &length)) {
+               pdata->ntc_size = 0;
        } else {
-               ret = of_property_read_u32(test_np, "test_charge_currentmA",
-                                          &out_value);
-               if (ret < 0) {
-                       dev_err(dev, "test_charge_currentmA not found!\n");
-                       out_value = DEF_TEST_CURRENT_MA;
+               /* get ntc degree base value */
+               ret = of_property_read_u32_index(np, "ntc_degree_from", 1,
+                                                &pdata->ntc_degree_from);
+               if (ret) {
+                       dev_err(dev, "invalid ntc_degree_from\n");
+                       return -EINVAL;
                }
-               di->test_chrg_current = out_value;
 
-               ret = of_property_read_u32(test_np, "test_charge_ilimitmA",
+               of_property_read_u32_index(np, "ntc_degree_from", 0,
                                           &out_value);
-               if (ret < 0) {
-                       dev_err(dev, "test_charge_ilimitmA not found!\n");
-                       out_value = DEF_TEST_ILMT_MA;
-               }
-               di->test_chrg_ilmt = out_value;
+               if (out_value)
+                       pdata->ntc_degree_from = -pdata->ntc_degree_from;
+
+               pdata->ntc_size = length / sizeof(u32);
        }
 
-       /*************  charger support adp types **********************/
-       ret = of_property_read_u32(regs, "support_uboot_chrg", &support_uboot_chrg);
-       ret = of_property_read_u32(regs, "support_usb_adp", &support_usb_adp);
-       ret = of_property_read_u32(regs, "support_dc_adp", &support_dc_adp);
-       ret = of_property_read_u32(regs, "dc_det_pullup_inside", &out_value);
-       if (ret < 0)
-               out_value = 0;
-       di->dc_det_pullup_inside = out_value;
-
-       if (!support_usb_adp && !support_dc_adp) {
-               dev_err(dev, "miss both: usb_adp and dc_adp,default:usb_adp!\n");
-               support_usb_adp = 1;
-       }
-
-       if (support_dc_adp)
-               rk81x_dc_det_init(di, regs);
-
-       cell_cfg->ocv = ocv_cfg;
-       data->cell_cfg = cell_cfg;
-       rk818->battery_data = data;
-
-       DBG("\n--------- the battery OCV TABLE dump:\n");
-       DBG("bat_res :%d\n", data->sense_resistor_mohm);
-       DBG("max_charge_ilimitmA :%d\n", data->max_charger_ilimitmA);
-       DBG("max_charge_currentmA :%d\n", data->max_charger_currentmA);
-       DBG("max_charge_voltagemV :%d\n", data->max_charger_voltagemV);
-       DBG("design_capacity :%d\n", cell_cfg->design_capacity);
-       DBG("design_qmax :%d\n", cell_cfg->design_qmax);
-       DBG("sleep_enter_current :%d\n", cell_cfg->ocv->sleep_enter_current);
-       DBG("sleep_exit_current :%d\n", cell_cfg->ocv->sleep_exit_current);
-       DBG("support_uboot_chrg = %d\n", support_uboot_chrg);
-       DBG("support_usb_adp = %d\n", support_usb_adp);
-       DBG("support_dc_adp= %d\n", support_dc_adp);
-       DBG("test_charge_currentmA = %d\n", di->test_chrg_current);
-       DBG("test_charge_ilimitmA = %d\n", di->test_chrg_ilmt);
-       DBG("dc_det_pullup_inside = %d\n", di->dc_det_pullup_inside);
-       DBG("--------- rk818_battery dt_parse ok.\n");
+       if (pdata->ntc_size) {
+               size = sizeof(*pdata->ntc_table) * pdata->ntc_size;
+               pdata->ntc_table = devm_kzalloc(di->dev, size, GFP_KERNEL);
+               if (!pdata->ntc_table)
+                       return -ENOMEM;
+
+               ret = of_property_read_u32_array(np, "ntc_table",
+                                                pdata->ntc_table,
+                                                pdata->ntc_size);
+               if (ret < 0)
+                       return ret;
+       }
+
+       DBG("the battery dts info dump:\n"
+           "bat_res:%d\n"
+           "design_capacity:%d\n"
+           "design_qmax :%d\n"
+           "sleep_enter_current:%d\n"
+           "sleep_exit_current:%d\n"
+           "zero_algorithm_vol:%d\n"
+           "zero_reserve_dsoc:%d\n"
+           "monitor_sec:%d\n"
+           "max_soc_offset:%d\n"
+           "virtual_power:%d\n"
+           "pwroff_vol:%d\n"
+           "sample_res:%d\n"
+           "ntc_size=%d\n"
+           "ntc_degree_from:%d\n"
+           "ntc_degree_to:%d\n",
+           pdata->bat_res, pdata->design_capacity, pdata->design_qmax,
+           pdata->sleep_enter_current, pdata->sleep_exit_current,
+           pdata->zero_algorithm_vol, pdata->zero_reserve_dsoc,
+           pdata->monitor_sec,
+           pdata->max_soc_offset, pdata->bat_mode, pdata->pwroff_vol,
+           pdata->sample_res, pdata->ntc_size, pdata->ntc_degree_from,
+           pdata->ntc_degree_from + pdata->ntc_size - 1
+           );
+
        return 0;
 }
-
 #else
-static int rk81x_battery_parse_dt(struct battery_info *di)
+static int rk818_bat_parse_dt(struct rk818_battery *di)
 {
        return -ENODEV;
 }
 #endif
 
+static const struct of_device_id rk818_battery_of_match[] = {
+       {.compatible = "rk818-battery",},
+       { },
+};
 
-static int rk81x_battery_probe(struct platform_device *pdev)
+static int rk818_battery_probe(struct platform_device *pdev)
 {
-       struct rk818 *chip = dev_get_drvdata(pdev->dev.parent);
-       struct battery_info *di;
+       const struct of_device_id *of_id =
+                       of_match_device(rk818_battery_of_match, &pdev->dev);
+       struct rk818_battery *di;
+       struct rk808 *rk818 = dev_get_drvdata(pdev->dev.parent);
        int ret;
 
-       DBG("battery driver version %s\n", DRIVER_VERSION);
+       if (!of_id) {
+               dev_err(&pdev->dev, "Failed to find matching dt id\n");
+               return -ENODEV;
+       }
+
        di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL);
-       if (!di) {
-               dev_err(&pdev->dev, "kzalloc di failed!\n");
+       if (!di)
                return -ENOMEM;
-       }
-       di->rk818 = chip;
+
+       di->rk818 = rk818;
+       di->pdev = pdev;
        di->dev = &pdev->dev;
+       di->regmap = rk818->regmap;
        platform_set_drvdata(pdev, di);
 
-       ret = rk81x_battery_parse_dt(di);
+       ret = rk818_bat_parse_dt(di);
        if (ret < 0) {
-               dev_err(&pdev->dev, "rk81x battery parse dt failed!\n");
+               dev_err(di->dev, "rk818 battery parse dt failed!\n");
                return ret;
        }
-       rk81x_battery_info_init(di, chip);
-       if (!is_rk81x_bat_exist(di)) {
-               pr_info("not find Li-ion battery, test power mode\n");
-               rk81x_battery_charger_init(di);
-               di->fg_drv_mode = TEST_POWER_MODE;
+
+       if (!is_rk818_bat_exist(di)) {
+               di->pdata->bat_mode = MODE_VIRTUAL;
+               dev_err(di->dev, "no battery, virtual power mode\n");
        }
 
-       battery_power_supply_init(di);
-       ret = battery_power_supply_register(di);
-       if (ret) {
-               dev_err(&pdev->dev, "rk81x power supply register failed!\n");
+       ret = rk818_bat_init_irqs(di);
+       if (ret != 0) {
+               dev_err(di->dev, "rk818 bat init irqs failed!\n");
                return ret;
        }
 
-       rk81x_battery_irq_init(di);
-       rk81x_battery_sysfs_init(di, &pdev->dev);
-
-       rk81x_fg_init(di);
-       wake_lock_init(&di->resume_wake_lock, WAKE_LOCK_SUSPEND,
-                      "resume_charging");
-       flatzone_voltage_init(di);
-       rk81x_check_battery_status(di);
+       ret = rk818_bat_init_power_supply(di);
+       if (ret) {
+               dev_err(di->dev, "rk818 power supply register failed!\n");
+               return ret;
+       }
 
-       di->wq = create_singlethread_workqueue("rk81x-battery-work");
-       INIT_DELAYED_WORK(&di->battery_monitor_work, rk81x_battery_work);
-       queue_delayed_work(di->wq, &di->battery_monitor_work,
-                          msecs_to_jiffies(TIMER_MS_COUNTS*5));
-       INIT_DELAYED_WORK(&di->charge_check_work,
-                         rk81x_battery_charge_check_work);
-       di->battery_nb.notifier_call = battery_notifier_call;
-       register_battery_notifier(&di->battery_nb);
+       rk818_bat_init_info(di);
+       rk818_bat_init_fg(di);
+       rk818_bat_init_sysfs(di);
+       rk818_bat_register_fb_notify(di);
+       wake_lock_init(&di->wake_lock, WAKE_LOCK_SUSPEND, "rk818_bat_lock");
+       di->bat_monitor_wq = alloc_ordered_workqueue("%s",
+                       WQ_MEM_RECLAIM | WQ_FREEZABLE, "rk818-bat-monitor-wq");
+       INIT_DELAYED_WORK(&di->bat_delay_work, rk818_battery_work);
+       queue_delayed_work(di->bat_monitor_wq, &di->bat_delay_work,
+                          msecs_to_jiffies(TIMER_MS_COUNTS * 5));
 
-       DBG("rk81x battery probe ok!\n");
+       BAT_INFO("driver version %s\n", DRIVER_VERSION);
 
        return ret;
 }
 
-
-#ifdef CONFIG_PM
-
-static int rk81x_battery_suspend(struct platform_device *dev,
+static int rk818_battery_suspend(struct platform_device *dev,
                                 pm_message_t state)
 {
-       struct battery_info *di = platform_get_drvdata(dev);
+       struct rk818_battery *di = platform_get_drvdata(dev);
+       u8 val, st;
+
+       cancel_delayed_work_sync(&di->bat_delay_work);
 
-       enable_vbat_low_irq(di);
-       di->sleep_status = di->status;
+       di->s2r = false;
+       di->sleep_chrg_online = rk818_bat_chrg_online(di);
+       di->sleep_chrg_status = rk818_bat_get_chrg_status(di);
+       di->current_avg = rk818_bat_get_avg_current(di);
+       di->remain_cap = rk818_bat_get_coulomb_cap(di);
+       di->rsoc = rk818_bat_get_rsoc(di);
+       do_gettimeofday(&di->rtc_base);
+       rk818_bat_save_data(di);
+       st = (rk818_bat_read(di, RK818_SUP_STS_REG) & CHRG_STATUS_MSK) >> 4;
 
-       /* avoid abrupt wakeup which will clean the variable*/
-       if (di->sys_wakeup) {
-               di->suspend_cap = di->remain_capacity;
-               di->suspend_rsoc = _get_soc(di);
-               di->suspend_time_start = get_seconds();
-               di->sys_wakeup = false;
+       /* if not CHARGE_FINISH, reinit finish_base.
+        * avoid sleep loop between suspend and resume
+        */
+       if (di->sleep_chrg_status != CHARGE_FINISH)
+               di->finish_base = get_boot_sec();
+
+       /* avoid: enter suspend from MODE_ZERO: load from heavy to light */
+       if ((di->work_mode == MODE_ZERO) &&
+           (di->sleep_chrg_online) && (di->current_avg >= 0)) {
+               DBG("suspend: MODE_ZERO exit...\n");
+               /* it need't do prepare for mode finish and smooth, it will
+                * be done in display_smooth
+                */
+               if (di->sleep_chrg_status == CHARGE_FINISH) {
+                       di->work_mode = MODE_FINISH;
+                       di->finish_base = get_boot_sec();
+               } else {
+                       di->work_mode = MODE_SMOOTH;
+                       rk818_bat_smooth_algo_prepare(di);
+               }
        }
 
-       pr_info("rk81x-battery suspend: v=%d ld=%d lr=%d c=%d chg=%d\n",
-               _get_battery_voltage(di), di->real_soc, _get_soc(di),
-               _get_average_current(di), di->status);
+       /* set vbat low than 3.4v to generate a wakeup irq */
+       val = rk818_bat_read(di, RK818_VB_MON_REG);
+       val &= (~(VBAT_LOW_VOL_MASK | VBAT_LOW_ACT_MASK));
+       val |= (RK818_VBAT_LOW_3V4 | EN_VBAT_LOW_IRQ);
+       rk818_bat_write(di, RK818_VB_MON_REG, val);
+       rk818_bat_set_bits(di, RK818_INT_STS_MSK_REG1, VB_LOW_INT_EN, 0);
 
-       cancel_delayed_work(&di->battery_monitor_work);
+       BAT_INFO("suspend: dl=%d rl=%d c=%d v=%d cap=%d at=%ld ch=%d st=%s\n",
+                di->dsoc, di->rsoc, di->current_avg,
+                rk818_bat_get_avg_voltage(di), rk818_bat_get_coulomb_cap(di),
+                di->sleep_dischrg_sec, di->sleep_chrg_online, bat_status[st]);
 
        return 0;
 }
 
-static int rk81x_battery_resume(struct platform_device *dev)
-{
-       struct battery_info *di = platform_get_drvdata(dev);
+static int rk818_battery_resume(struct platform_device *dev)
+{
+       struct rk818_battery *di = platform_get_drvdata(dev);
+       int interval_sec, time_step, pwroff_vol;
+       u8 val, st;
+
+       di->s2r = true;
+       di->current_avg = rk818_bat_get_avg_current(di);
+       di->voltage_relax = rk818_bat_get_relax_voltage(di);
+       di->voltage_avg = rk818_bat_get_avg_voltage(di);
+       di->remain_cap = rk818_bat_get_coulomb_cap(di);
+       di->rsoc = rk818_bat_get_rsoc(di);
+       interval_sec = rk818_bat_rtc_sleep_sec(di);
+       di->sleep_sum_sec += interval_sec;
+       pwroff_vol = di->pdata->pwroff_vol;
+       st = (rk818_bat_read(di, RK818_SUP_STS_REG) & CHRG_STATUS_MSK) >> 4;
+
+       if (!di->sleep_chrg_online) {
+               /* only add up discharge sleep seconds */
+               di->sleep_dischrg_sec += interval_sec;
+               if (di->voltage_avg <= pwroff_vol + 50)
+                       time_step = DISCHRG_TIME_STEP1;
+               else
+                       time_step = DISCHRG_TIME_STEP2;
+       }
 
-       di->resume = true;
-       disable_vbat_low_irq(di);
-       queue_delayed_work(di->wq, &di->battery_monitor_work,
-                          msecs_to_jiffies(TIMER_MS_COUNTS/2));
+       BAT_INFO("resume: dl=%d rl=%d c=%d v=%d rv=%d "
+                "cap=%d dt=%d at=%ld ch=%d st=%s\n",
+                di->dsoc, di->rsoc, di->current_avg, di->voltage_avg,
+                di->voltage_relax, rk818_bat_get_coulomb_cap(di), interval_sec,
+                di->sleep_dischrg_sec, di->sleep_chrg_online, bat_status[st]);
 
-       if (di->sleep_status == POWER_SUPPLY_STATUS_CHARGING ||
-           di->real_soc <= 5)
-               wake_lock_timeout(&di->resume_wake_lock, 5*HZ);
+       /* sleep: enough time and discharge */
+       if ((di->sleep_dischrg_sec > time_step) && (!di->sleep_chrg_online)) {
+               if (rk818_bat_sleep_dischrg(di))
+                       di->sleep_dischrg_sec = 0;
+       }
 
-       pr_info("rk81x-battery resume: v=%d  rv=%d ld=%d lr=%d c=%d chg=%d\n",
-               _get_battery_voltage(di), get_relax_voltage(di),
-               di->real_soc, _get_soc(di), _get_average_current(di),
-               di->status);
-       return 0;
-}
-static int rk81x_battery_remove(struct platform_device *dev)
-{
-       struct battery_info *di = platform_get_drvdata(dev);
+       rk818_bat_save_data(di);
+
+       /* set vbat lowest 3.0v shutdown */
+       val = rk818_bat_read(di, RK818_VB_MON_REG);
+       val &= ~(VBAT_LOW_VOL_MASK | VBAT_LOW_ACT_MASK);
+       val |= (RK818_VBAT_LOW_3V0 | EN_VABT_LOW_SHUT_DOWN);
+       rk818_bat_write(di, RK818_VB_MON_REG, val);
+       rk818_bat_set_bits(di, RK818_INT_STS_MSK_REG1,
+                          VB_LOW_INT_EN, VB_LOW_INT_EN);
+
+       /* charge/lowpower lock: for battery work to update dsoc and rsoc */
+       if ((di->sleep_chrg_online) ||
+           (!di->sleep_chrg_online && di->voltage_avg < di->pdata->pwroff_vol))
+               wake_lock_timeout(&di->wake_lock, msecs_to_jiffies(2000));
+
+       queue_delayed_work(di->bat_monitor_wq, &di->bat_delay_work,
+                          msecs_to_jiffies(1000));
 
-       cancel_delayed_work_sync(&di->battery_monitor_work);
        return 0;
 }
-static void rk81x_battery_shutdown(struct platform_device *dev)
+
+static void rk818_battery_shutdown(struct platform_device *dev)
 {
-       struct battery_info *di = platform_get_drvdata(dev);
+       u8 cnt = 0;
+       struct rk818_battery *di = platform_get_drvdata(dev);
 
-       cancel_delayed_work_sync(&di->battery_monitor_work);
-       if (BASE_TO_MIN(di->sys_on_base) <= REBOOT_INTER_MIN)
-               rk81x_check_reboot(di);
+       cancel_delayed_work_sync(&di->bat_delay_work);
+       cancel_delayed_work_sync(&di->calib_delay_work);
+       rk818_bat_unregister_fb_notify(di);
+       del_timer(&di->caltimer);
+       if (base2sec(di->boot_base) < REBOOT_PERIOD_SEC)
+               cnt = rk818_bat_check_reboot(di);
        else
-               copy_reboot_cnt(di, 0);
-       DBG("rk818 shutdown!");
-}
-#endif
-
-static struct platform_driver rk81x_battery_driver = {
-       .driver     = {
-               .name   = "rk818-battery",
-               .owner  = THIS_MODULE,
+               rk818_bat_save_reboot_cnt(di, 0);
+
+       BAT_INFO("shutdown: dl=%d rl=%d c=%d v=%d cap=%d f=%d ch=%d n=%d "
+                "mode=%d rest=%d\n",
+                di->dsoc, di->rsoc, di->current_avg, di->voltage_avg,
+                di->remain_cap, di->fcc, rk818_bat_chrg_online(di), cnt,
+                di->algo_rest_mode, di->algo_rest_val);
+}
+
+static struct platform_driver rk818_battery_driver = {
+       .probe = rk818_battery_probe,
+       .suspend = rk818_battery_suspend,
+       .resume = rk818_battery_resume,
+       .shutdown = rk818_battery_shutdown,
+       .driver = {
+               .name = "rk818-battery",
+               .of_match_table = rk818_battery_of_match,
        },
-
-       .probe      = rk81x_battery_probe,
-       .remove     = rk81x_battery_remove,
-       .suspend    = rk81x_battery_suspend,
-       .resume     = rk81x_battery_resume,
-       .shutdown   = rk81x_battery_shutdown,
 };
 
 static int __init battery_init(void)
 {
-       return platform_driver_register(&rk81x_battery_driver);
+       return platform_driver_register(&rk818_battery_driver);
 }
-
 fs_initcall_sync(battery_init);
+
 static void __exit battery_exit(void)
 {
-       platform_driver_unregister(&rk81x_battery_driver);
+       platform_driver_unregister(&rk818_battery_driver);
 }
 module_exit(battery_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:rk818-battery");
-MODULE_AUTHOR("ROCKCHIP");
+MODULE_AUTHOR("chenjh<chenjh@rock-chips.com>");