power: pm8921-charger: Add HTC variants of pm8921-charger, pm8921-bms

HTC kernel version: villeu-jb-crc-3.4.10-ae8b65e

Change-Id: I2a0f9fc8b80bbf4fee5bd2d840fcb86a59b0ab68
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index 088c756..6850fab 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -24,7 +24,11 @@
 #include <linux/mfd/pm8xxx/pm8921.h>
 #include <linux/mfd/pm8xxx/core.h>
 #include <linux/mfd/pm8xxx/regulator.h>
+#ifdef CONFIG_MACH_HTC
+#include <linux/leds-pm8xxx-htc.h>
+#else
 #include <linux/leds-pm8xxx.h>
+#endif
 
 #define REG_HWREV		0x002  /* PMIC4 revision */
 #define REG_HWREV_2		0x0E8  /* PMIC4 revision 2 */
diff --git a/drivers/misc/cable_detect_8xxx.c b/drivers/misc/cable_detect_8xxx.c
index 00ed513..209eb6e 100644
--- a/drivers/misc/cable_detect_8xxx.c
+++ b/drivers/misc/cable_detect_8xxx.c
@@ -41,7 +41,7 @@
 #include "../video/msm/sii9234/TPI.h"
 #endif
 
-#include "linux/mfd/pm8xxx/pm8921-charger.h"
+#include "linux/mfd/pm8xxx/pm8921-charger-htc.h"
 
 static int vbus;
 
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index f84b527..bee4e19 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -54,8 +54,13 @@
 obj-$(CONFIG_BATTERY_BQ27541)	+= bq27541_fuelgauger.o
 obj-$(CONFIG_SMB137B_CHARGER)   += smb137b.o
 obj-$(CONFIG_PM8XXX_CCADC)	+= pm8xxx-ccadc.o
+ifeq ($(CONFIG_HTC_BATT_8960),y)
+obj-$(CONFIG_PM8921_BMS)	+= pm8921-bms-htc.o
+obj-$(CONFIG_PM8921_CHARGER)	+= pm8921-charger-htc.o
+else
 obj-$(CONFIG_PM8921_BMS)	+= pm8921-bms.o
 obj-$(CONFIG_PM8921_CHARGER)	+= pm8921-charger.o
+endif
 obj-$(CONFIG_LTC4088_CHARGER)	+= ltc4088-charger.o
 obj-$(CONFIG_CHARGER_SMB347)	+= smb347-charger.o
 obj-$(CONFIG_BATTERY_BCL)	+= battery_current_limit.o
diff --git a/drivers/power/pm8921-bms-htc.c b/drivers/power/pm8921-bms-htc.c
new file mode 100644
index 0000000..65b6400
--- /dev/null
+++ b/drivers/power/pm8921-bms-htc.c
@@ -0,0 +1,2896 @@
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ *
+ */
+#define pr_fmt(fmt)	"[BATT][BMS] " fmt
+#define pr_fmt_debug(fmt)    "[BATT][BMS]%s: " fmt, __func__
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+#include <linux/errno.h>
+#include <linux/mfd/pm8xxx/pm8921-bms-htc.h>
+#include <linux/mfd/pm8xxx/pm8921-charger-htc.h>
+#include <linux/mfd/pm8xxx/core.h>
+#include <linux/mfd/pm8xxx/pm8xxx-adc.h>
+#include <linux/mfd/pm8xxx/ccadc.h>
+#include <linux/interrupt.h>
+#include <linux/bitops.h>
+#include <linux/debugfs.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <mach/board_htc.h>
+
+#ifdef CONFIG_HTC_BATT_8960
+#include "mach/htc_battery_cell.h"
+#endif
+
+#if defined(pr_debug)
+#undef pr_debug
+#endif
+#define pr_debug(fmt, ...) do { \
+		if (flag_enable_bms_chg_log) \
+			printk(KERN_INFO pr_fmt_debug(fmt), ##__VA_ARGS__); \
+	} while (0)
+static bool flag_enable_bms_chg_log;
+
+#define BMS_CONTROL		0x224
+#define BMS_S1_DELAY	0x225
+#define BMS_OUTPUT0		0x230
+#define BMS_OUTPUT1		0x231
+#define BMS_TOLERANCES		0x232
+#define BMS_TEST1		0x237
+
+#define ADC_ARB_SECP_CNTRL	0x190
+#define ADC_ARB_SECP_AMUX_CNTRL	0x191
+#define ADC_ARB_SECP_ANA_PARAM	0x192
+#define ADC_ARB_SECP_DIG_PARAM	0x193
+#define ADC_ARB_SECP_RSV	0x194
+#define ADC_ARB_SECP_DATA1	0x195
+#define ADC_ARB_SECP_DATA0	0x196
+
+#define ADC_ARB_BMS_CNTRL	0x18D
+#define AMUX_TRIM_2			0x322
+#define TEST_PROGRAM_REV	0x339
+
+#define OCV_UPDATE_STORAGE	0x105
+#define OCV_UPDATE_STORAGE_USE_MASK	0x0F
+
+enum pmic_bms_interrupts {
+	PM8921_BMS_SBI_WRITE_OK,
+	PM8921_BMS_CC_THR,
+	PM8921_BMS_VSENSE_THR,
+	PM8921_BMS_VSENSE_FOR_R,
+	PM8921_BMS_OCV_FOR_R,
+	PM8921_BMS_GOOD_OCV,
+	PM8921_BMS_VSENSE_AVG,
+	PM_BMS_MAX_INTS,
+};
+
+struct pm8921_soc_params {
+	uint16_t	last_good_ocv_raw;
+	int		cc;
+
+	int		last_good_ocv_uv;
+};
+
+struct pm8921_rbatt_params {
+	uint16_t	ocv_for_rbatt_raw;
+	uint16_t	vsense_for_rbatt_raw;
+	uint16_t	vbatt_for_rbatt_raw;
+
+	int		ocv_for_rbatt_uv;
+	int		vsense_for_rbatt_uv;
+	int		vbatt_for_rbatt_uv;
+};
+
+struct pm8921_bms_chip {
+	struct device		*dev;
+	struct dentry		*dent;
+	unsigned int		r_sense;
+	unsigned int		i_test;
+	unsigned int		v_failure;
+	unsigned int		fcc;
+	struct single_row_lut	*fcc_temp_lut;
+	struct single_row_lut	*fcc_sf_lut;
+	struct pc_temp_ocv_lut	*pc_temp_ocv_lut;
+	struct sf_lut		*pc_sf_lut;
+	struct sf_lut		*rbatt_sf_lut;
+	int			delta_rbatt_mohm;
+	struct work_struct	calib_hkadc_work;
+	unsigned int		revision;
+	unsigned int		xoadc_v0625_usb_present;
+	unsigned int		xoadc_v0625_usb_absent;
+	unsigned int		xoadc_v0625;
+	unsigned int		xoadc_v125;
+	unsigned int		batt_temp_channel;
+	unsigned int		vbat_channel;
+	unsigned int		ref625mv_channel;
+	unsigned int		ref1p25v_channel;
+	unsigned int		batt_id_channel;
+	unsigned int		pmic_bms_irq[PM_BMS_MAX_INTS];
+	DECLARE_BITMAP(enabled_irqs, PM_BMS_MAX_INTS);
+	struct mutex		bms_output_lock;
+	spinlock_t		bms_100_lock;
+	struct single_row_lut	*adjusted_fcc_temp_lut;
+	unsigned int		charging_began;
+	int					start_percent;
+	int					end_percent;
+
+	uint16_t		ocv_reading_at_100;
+	int			cc_reading_at_100;
+	int			max_voltage_uv;
+	int			batt_temp_suspend;
+	int			soc_rbatt_suspend;
+	int			default_rbatt_mohm;
+	unsigned int	rconn_mohm;
+	int			amux_2_trim_delta;
+	uint16_t		prev_last_good_ocv_raw;
+	int			usb_chg_plugged_ready;
+};
+
+static struct pm8921_bms_chip *the_chip;
+
+struct pm8921_bms_debug {
+	int rbatt;
+	int rbatt_sf;
+	int voltage_unusable_uv;
+	int pc_unusable;
+	int rc_pc;
+	int scalefactor;
+	int batt_temp;
+	int soc_rbatt;
+};
+static struct pm8921_bms_debug bms_dbg;
+
+#define DEFAULT_RBATT_MOHMS		128
+#define DEFAULT_OCV_MICROVOLTS		3900000
+#define DEFAULT_CHARGE_CYCLES		0
+
+static int last_usb_cal_delta_uv = 1800;
+module_param(last_usb_cal_delta_uv, int, 0644);
+
+static int last_chargecycles = DEFAULT_CHARGE_CYCLES;
+static int last_charge_increase;
+module_param(last_chargecycles, int, 0644);
+module_param(last_charge_increase, int, 0644);
+
+static int last_rbatt = -EINVAL;
+static int last_ocv_uv = -EINVAL;
+static int last_soc = -EINVAL;
+static int last_real_fcc_mah = -EINVAL;
+static int last_real_fcc_batt_temp = -EINVAL;
+
+static int bms_ops_set(const char *val, const struct kernel_param *kp)
+{
+	if (*(int *)kp->arg == -EINVAL)
+		return param_set_int(val, kp);
+	else
+		return 0;
+}
+
+static struct kernel_param_ops bms_param_ops = {
+	.set = bms_ops_set,
+	.get = param_get_int,
+};
+
+module_param_cb(last_rbatt, &bms_param_ops, &last_rbatt, 0644);
+module_param_cb(last_ocv_uv, &bms_param_ops, &last_ocv_uv, 0644);
+module_param_cb(last_soc, &bms_param_ops, &last_soc, 0644);
+
+static int bms_fake_battery = -EINVAL;
+module_param(bms_fake_battery, int, 0644);
+
+static int bms_start_percent;
+static int bms_start_ocv_uv;
+static int bms_start_cc_uah;
+static int bms_end_percent;
+static int bms_end_ocv_uv;
+static int bms_end_cc_uah;
+static int bms_discharge_percent;
+static int is_ocv_update_start;
+
+static int bms_ro_ops_set(const char *val, const struct kernel_param *kp)
+{
+	return -EINVAL;
+}
+
+static struct kernel_param_ops bms_ro_param_ops = {
+	.set = bms_ro_ops_set,
+	.get = param_get_int,
+};
+module_param_cb(bms_start_percent, &bms_ro_param_ops, &bms_start_percent, 0644);
+module_param_cb(bms_start_ocv_uv, &bms_ro_param_ops, &bms_start_ocv_uv, 0644);
+module_param_cb(bms_start_cc_uah, &bms_ro_param_ops, &bms_start_cc_uah, 0644);
+
+module_param_cb(bms_end_percent, &bms_ro_param_ops, &bms_end_percent, 0644);
+module_param_cb(bms_end_ocv_uv, &bms_ro_param_ops, &bms_end_ocv_uv, 0644);
+module_param_cb(bms_end_cc_uah, &bms_ro_param_ops, &bms_end_cc_uah, 0644);
+
+static int dump_cc_uah(void);
+
+static int interpolate_fcc(struct pm8921_bms_chip *chip, int batt_temp);
+static void readjust_fcc_table(void)
+{
+	struct single_row_lut *temp, *old;
+	int i, fcc, ratio;
+
+	if (!the_chip->fcc_temp_lut) {
+		pr_err("The static fcc lut table is NULL\n");
+		return;
+	}
+
+	temp = kzalloc(sizeof(struct single_row_lut), GFP_KERNEL);
+	if (!temp) {
+		pr_err("Cannot allocate memory for adjusted fcc table\n");
+		return;
+	}
+
+	fcc = interpolate_fcc(the_chip, last_real_fcc_batt_temp);
+
+	temp->cols = the_chip->fcc_temp_lut->cols;
+	for (i = 0; i < the_chip->fcc_temp_lut->cols; i++) {
+		temp->x[i] = the_chip->fcc_temp_lut->x[i];
+		ratio = div_u64(the_chip->fcc_temp_lut->y[i] * 1000, fcc);
+		temp->y[i] =  (ratio * last_real_fcc_mah);
+		temp->y[i] /= 1000;
+		pr_debug("temp=%d, staticfcc=%d, adjfcc=%d, ratio=%d\n",
+				temp->x[i], the_chip->fcc_temp_lut->y[i],
+				temp->y[i], ratio);
+	}
+
+	old = the_chip->adjusted_fcc_temp_lut;
+	the_chip->adjusted_fcc_temp_lut = temp;
+	kfree(old);
+}
+
+static int bms_last_real_fcc_set(const char *val,
+				const struct kernel_param *kp)
+{
+	int rc = 0;
+
+	if (last_real_fcc_mah == -EINVAL)
+		rc = param_set_int(val, kp);
+	if (rc) {
+		pr_err("Failed to set last_real_fcc_mah rc=%d\n", rc);
+		return rc;
+	}
+	if (last_real_fcc_batt_temp != -EINVAL)
+		readjust_fcc_table();
+	return rc;
+}
+static struct kernel_param_ops bms_last_real_fcc_param_ops = {
+	.set = bms_last_real_fcc_set,
+	.get = param_get_int,
+};
+module_param_cb(last_real_fcc_mah, &bms_last_real_fcc_param_ops,
+					&last_real_fcc_mah, 0644);
+
+static int bms_last_real_fcc_batt_temp_set(const char *val,
+				const struct kernel_param *kp)
+{
+	int rc = 0;
+
+	if (last_real_fcc_batt_temp == -EINVAL)
+		rc = param_set_int(val, kp);
+	if (rc) {
+		pr_err("Failed to set last_real_fcc_batt_temp rc=%d\n", rc);
+		return rc;
+	}
+	if (last_real_fcc_mah != -EINVAL)
+		readjust_fcc_table();
+	return rc;
+}
+
+static struct kernel_param_ops bms_last_real_fcc_batt_temp_param_ops = {
+	.set = bms_last_real_fcc_batt_temp_set,
+	.get = param_get_int,
+};
+module_param_cb(last_real_fcc_batt_temp, &bms_last_real_fcc_batt_temp_param_ops,
+					&last_real_fcc_batt_temp, 0644);
+
+static int pm_bms_get_rt_status(struct pm8921_bms_chip *chip, int irq_id)
+{
+	return pm8xxx_read_irq_stat(chip->dev->parent,
+					chip->pmic_bms_irq[irq_id]);
+}
+
+static void pm8921_bms_enable_irq(struct pm8921_bms_chip *chip, int interrupt)
+{
+	if (!__test_and_set_bit(interrupt, chip->enabled_irqs)) {
+		dev_dbg(chip->dev, "%s %d\n", __func__,
+						chip->pmic_bms_irq[interrupt]);
+		enable_irq(chip->pmic_bms_irq[interrupt]);
+	}
+}
+
+static void pm8921_bms_disable_irq(struct pm8921_bms_chip *chip, int interrupt)
+{
+	if (__test_and_clear_bit(interrupt, chip->enabled_irqs)) {
+		pr_debug("%d\n", chip->pmic_bms_irq[interrupt]);
+		disable_irq_nosync(chip->pmic_bms_irq[interrupt]);
+	}
+}
+
+static int pm_bms_masked_write(struct pm8921_bms_chip *chip, u16 addr,
+							u8 mask, u8 val)
+{
+	int rc;
+	u8 reg;
+
+	rc = pm8xxx_readb(chip->dev->parent, addr, &reg);
+	if (rc) {
+		pr_err("read failed addr = %03X, rc = %d\n", addr, rc);
+		return rc;
+	}
+	reg &= ~mask;
+	reg |= val & mask;
+	rc = pm8xxx_writeb(chip->dev->parent, addr, reg);
+	if (rc) {
+		pr_err("write failed addr = %03X, rc = %d\n", addr, rc);
+		return rc;
+	}
+	return 0;
+}
+
+static int usb_chg_plugged_in(void)
+{
+#if 0
+	union power_supply_propval ret = {0,};
+	static struct power_supply *psy;
+	if (psy == NULL) {
+		psy = power_supply_get_by_name("usb");
+		if (psy == NULL)
+			return 0;
+	}
+
+	if (psy->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &ret))
+		return 0;
+	return ret.intval;
+#endif
+	int rc = pm8921_is_usb_chg_plugged_in();
+	if (rc < 0) {
+		return 0;
+	}
+	the_chip->usb_chg_plugged_ready = 1;
+	return rc;
+}
+
+#define HOLD_OREG_DATA		BIT(1)
+static int pm_bms_lock_output_data(struct pm8921_bms_chip *chip)
+{
+	int rc;
+
+	rc = pm_bms_masked_write(chip, BMS_CONTROL, HOLD_OREG_DATA,
+					HOLD_OREG_DATA);
+	if (rc) {
+		pr_err("couldnt lock bms output rc = %d\n", rc);
+		return rc;
+	}
+	return 0;
+}
+
+static int pm_bms_unlock_output_data(struct pm8921_bms_chip *chip)
+{
+	int rc;
+
+	rc = pm_bms_masked_write(chip, BMS_CONTROL, HOLD_OREG_DATA, 0);
+	if (rc) {
+		pr_err("fail to unlock BMS_CONTROL rc = %d\n", rc);
+		return rc;
+	}
+	return 0;
+}
+
+#define SELECT_OUTPUT_DATA	0x1C
+#define SELECT_OUTPUT_TYPE_SHIFT	2
+#define OCV_FOR_RBATT		0x0
+#define VSENSE_FOR_RBATT	0x1
+#define VBATT_FOR_RBATT		0x2
+#define CC_MSB			0x3
+#define CC_LSB			0x4
+#define LAST_GOOD_OCV_VALUE	0x5
+#define VSENSE_AVG		0x6
+#define VBATT_AVG		0x7
+
+static int pm_bms_read_output_data(struct pm8921_bms_chip *chip, int type,
+						int16_t *result)
+{
+	int rc;
+	u8 reg;
+
+	if (!result) {
+		pr_err("result pointer null\n");
+		return -EINVAL;
+	}
+	*result = 0;
+	if (type < OCV_FOR_RBATT || type > VBATT_AVG) {
+		pr_err("invalid type %d asked to read\n", type);
+		return -EINVAL;
+	}
+
+	rc = pm_bms_masked_write(chip, BMS_CONTROL, SELECT_OUTPUT_DATA,
+					type << SELECT_OUTPUT_TYPE_SHIFT);
+	if (rc) {
+		pr_err("fail to select %d type in BMS_CONTROL rc = %d\n",
+						type, rc);
+		return rc;
+	}
+
+	rc = pm8xxx_readb(chip->dev->parent, BMS_OUTPUT0, &reg);
+	if (rc) {
+		pr_err("fail to read BMS_OUTPUT0 for type %d rc = %d\n",
+			type, rc);
+		return rc;
+	}
+	*result = reg;
+	rc = pm8xxx_readb(chip->dev->parent, BMS_OUTPUT1, &reg);
+	if (rc) {
+		pr_err("fail to read BMS_OUTPUT1 for type %d rc = %d\n",
+			type, rc);
+		return rc;
+	}
+	*result |= reg << 8;
+	pr_debug("type %d result %x", type, *result);
+	return 0;
+}
+
+#define V_PER_BIT_MUL_FACTOR	97656
+#define V_PER_BIT_DIV_FACTOR	1000
+#define XOADC_INTRINSIC_OFFSET	0x6000
+static int xoadc_reading_to_microvolt(unsigned int a)
+{
+	if (a <= XOADC_INTRINSIC_OFFSET)
+		return 0;
+
+	return (a - XOADC_INTRINSIC_OFFSET)
+			* V_PER_BIT_MUL_FACTOR / V_PER_BIT_DIV_FACTOR;
+}
+
+#define XOADC_CALIB_UV		625000
+#define VBATT_MUL_FACTOR	3
+static int adjust_xo_vbatt_reading(struct pm8921_bms_chip *chip,
+					int usb_chg, unsigned int uv)
+{
+	s64 numerator, denominator;
+	int local_delta;
+
+	if (uv == 0)
+		return 0;
+
+	
+	if (chip->xoadc_v0625 == 0 || chip->xoadc_v125 == 0) {
+		pr_debug("No cal yet return %d\n", VBATT_MUL_FACTOR * uv);
+		return VBATT_MUL_FACTOR * uv;
+	}
+
+	if (usb_chg)
+		local_delta = last_usb_cal_delta_uv;
+	else
+		local_delta = 0;
+
+	pr_debug("using delta = %d\n", local_delta);
+	numerator = ((s64)uv - chip->xoadc_v0625 - local_delta)
+							* XOADC_CALIB_UV;
+	denominator =  (s64)chip->xoadc_v125 - chip->xoadc_v0625 - local_delta;
+	if (denominator == 0)
+		return uv * VBATT_MUL_FACTOR;
+	return (XOADC_CALIB_UV + local_delta + div_s64(numerator, denominator))
+						* VBATT_MUL_FACTOR;
+}
+
+#define CC_RESOLUTION_N_V1	1085069
+#define CC_RESOLUTION_D_V1	100000
+#define CC_RESOLUTION_N_V2	868056
+#define CC_RESOLUTION_D_V2	10000
+
+static s64 cc_to_microvolt_v1(s64 cc)
+{
+	return div_s64(cc * CC_RESOLUTION_N_V1, CC_RESOLUTION_D_V1);
+}
+
+static s64 cc_to_microvolt_v2(s64 cc)
+{
+	return div_s64(cc * CC_RESOLUTION_N_V2, CC_RESOLUTION_D_V2);
+}
+
+static s64 cc_to_microvolt(struct pm8921_bms_chip *chip, s64 cc)
+{
+	return (chip->revision < PM8XXX_REVISION_8921_2p0) ?
+				cc_to_microvolt_v1((s64)cc) :
+				cc_to_microvolt_v2((s64)cc);
+}
+
+#define CC_READING_TICKS	56
+#define SLEEP_CLK_HZ		32764
+#define SECONDS_PER_HOUR	3600
+static s64 ccmicrovolt_to_nvh(s64 cc_uv)
+{
+	return div_s64(cc_uv * CC_READING_TICKS * 1000,
+			SLEEP_CLK_HZ * SECONDS_PER_HOUR);
+}
+
+static int read_cc(struct pm8921_bms_chip *chip, int *result)
+{
+	int rc;
+	uint16_t msw, lsw;
+
+	rc = pm_bms_read_output_data(chip, CC_LSB, &lsw);
+	if (rc) {
+		pr_err("fail to read CC_LSB rc = %d\n", rc);
+		return rc;
+	}
+	rc = pm_bms_read_output_data(chip, CC_MSB, &msw);
+	if (rc) {
+		pr_err("fail to read CC_MSB rc = %d\n", rc);
+		return rc;
+	}
+	*result = msw << 16 | lsw;
+	pr_debug("msw = %04x lsw = %04x cc = %d\n", msw, lsw, *result);
+	return 0;
+}
+
+static int adjust_xo_vbatt_reading_for_mbg(struct pm8921_bms_chip *chip,
+						int result)
+{
+	int64_t numerator;
+	int64_t denominator;
+
+	if (chip->amux_2_trim_delta == 0)
+		return result;
+
+	numerator = (s64)result * 1000000;
+	denominator = (1000000 + (410 * (s64)chip->amux_2_trim_delta));
+	return div_s64(numerator, denominator);
+}
+
+static int convert_vbatt_raw_to_uv(struct pm8921_bms_chip *chip,
+					int usb_chg,
+					uint16_t reading, int *result)
+{
+	*result = xoadc_reading_to_microvolt(reading);
+	pr_debug("raw = %04x vbatt = %u\n", reading, *result);
+	*result = adjust_xo_vbatt_reading(chip, usb_chg, *result);
+	pr_debug("after adj vbatt = %u\n", *result);
+	*result = adjust_xo_vbatt_reading_for_mbg(chip, *result);
+	pr_debug("after mbg adj vbatt = %u\n", *result);
+	return 0;
+}
+
+static int convert_vsense_to_uv(struct pm8921_bms_chip *chip,
+					int16_t reading, int *result)
+{
+	*result = pm8xxx_ccadc_reading_to_microvolt(chip->revision, reading);
+	pr_debug("raw = %04x vsense = %d\n", reading, *result);
+	*result = pm8xxx_cc_adjust_for_gain(*result);
+	pr_debug("after adj vsense = %d\n", *result);
+	return 0;
+}
+
+static int read_vsense_avg(struct pm8921_bms_chip *chip, int *result)
+{
+	int rc;
+	int16_t reading;
+
+	rc = pm_bms_read_output_data(chip, VSENSE_AVG, &reading);
+	if (rc) {
+		pr_err("fail to read VSENSE_AVG rc = %d\n", rc);
+		return rc;
+	}
+
+	convert_vsense_to_uv(chip, reading, result);
+	return 0;
+}
+
+static int linear_interpolate(int y0, int x0, int y1, int x1, int x)
+{
+	if (y0 == y1 || x == x0)
+		return y0;
+	if (x1 == x0 || x == x1)
+		return y1;
+
+	return y0 + ((y1 - y0) * (x - x0) / (x1 - x0));
+}
+
+static int interpolate_single_lut(struct single_row_lut *lut, int x)
+{
+	int i, result;
+
+	if (x < lut->x[0]) {
+		pr_debug("x %d less than known range return y = %d lut = %pS\n",
+							x, lut->y[0], lut);
+		return lut->y[0];
+	}
+	if (x > lut->x[lut->cols - 1]) {
+		pr_debug("x %d more than known range return y = %d lut = %pS\n",
+						x, lut->y[lut->cols - 1], lut);
+		return lut->y[lut->cols - 1];
+	}
+
+	for (i = 0; i < lut->cols; i++)
+		if (x <= lut->x[i])
+			break;
+	if (x == lut->x[i]) {
+		result = lut->y[i];
+	} else {
+		result = linear_interpolate(
+			lut->y[i - 1],
+			lut->x[i - 1],
+			lut->y[i],
+			lut->x[i],
+			x);
+	}
+	return result;
+}
+
+static int interpolate_fcc(struct pm8921_bms_chip *chip, int batt_temp)
+{
+	
+	batt_temp = batt_temp/10;
+	return interpolate_single_lut(chip->fcc_temp_lut, batt_temp);
+}
+
+static int interpolate_fcc_adjusted(struct pm8921_bms_chip *chip, int batt_temp)
+{
+	
+	batt_temp = batt_temp/10;
+	return interpolate_single_lut(chip->adjusted_fcc_temp_lut, batt_temp);
+}
+
+static int interpolate_scalingfactor_fcc(struct pm8921_bms_chip *chip,
+								int cycles)
+{
+	if (chip->fcc_sf_lut)
+		return interpolate_single_lut(chip->fcc_sf_lut, cycles);
+	else
+		return 100;
+}
+
+static int interpolate_scalingfactor(struct pm8921_bms_chip *chip,
+				struct sf_lut *sf_lut,
+				int row_entry, int pc)
+{
+	int i, scalefactorrow1, scalefactorrow2, scalefactor;
+	int rows, cols;
+	int row1 = 0;
+	int row2 = 0;
+
+	if (!sf_lut)
+		return 100;
+
+	rows = sf_lut->rows;
+	cols = sf_lut->cols;
+	if (pc > sf_lut->percent[0]) {
+		pr_debug("pc %d greater than known pc ranges for sfd\n", pc);
+		row1 = 0;
+		row2 = 0;
+	}
+	if (pc < sf_lut->percent[rows - 1]) {
+		pr_debug("pc %d less than known pc ranges for sf", pc);
+		row1 = rows - 1;
+		row2 = rows - 1;
+	}
+	for (i = 0; i < rows; i++) {
+		if (pc == sf_lut->percent[i]) {
+			row1 = i;
+			row2 = i;
+			break;
+		}
+		if (pc > sf_lut->percent[i]) {
+			row1 = i - 1;
+			row2 = i;
+			break;
+		}
+	}
+
+	if (row_entry < sf_lut->row_entries[0])
+		row_entry = sf_lut->row_entries[0];
+	if (row_entry > sf_lut->row_entries[cols - 1])
+		row_entry = sf_lut->row_entries[cols - 1];
+
+	for (i = 0; i < cols; i++)
+		if (row_entry <= sf_lut->row_entries[i])
+			break;
+	if (row_entry == sf_lut->row_entries[i]) {
+		scalefactor = linear_interpolate(
+				sf_lut->sf[row1][i],
+				sf_lut->percent[row1],
+				sf_lut->sf[row2][i],
+				sf_lut->percent[row2],
+				pc);
+		return scalefactor;
+	}
+
+	scalefactorrow1 = linear_interpolate(
+				sf_lut->sf[row1][i - 1],
+				sf_lut->row_entries[i - 1],
+				sf_lut->sf[row1][i],
+				sf_lut->row_entries[i],
+				row_entry);
+
+	scalefactorrow2 = linear_interpolate(
+				sf_lut->sf[row2][i - 1],
+				sf_lut->row_entries[i - 1],
+				sf_lut->sf[row2][i],
+				sf_lut->row_entries[i],
+				row_entry);
+
+	scalefactor = linear_interpolate(
+				scalefactorrow1,
+				sf_lut->percent[row1],
+				scalefactorrow2,
+				sf_lut->percent[row2],
+				pc);
+
+	return scalefactor;
+}
+
+static int is_between(int left, int right, int value)
+{
+	if (left >= right && left >= value && value >= right)
+		return 1;
+	if (left <= right && left <= value && value <= right)
+		return 1;
+
+	return 0;
+}
+
+static int interpolate_pc(struct pm8921_bms_chip *chip,
+				int batt_temp, int ocv)
+{
+	int i, j, pcj, pcj_minus_one, pc;
+	int rows = chip->pc_temp_ocv_lut->rows;
+	int cols = chip->pc_temp_ocv_lut->cols;
+
+	
+	batt_temp = batt_temp/10;
+
+	if (batt_temp < chip->pc_temp_ocv_lut->temp[0]) {
+		pr_debug("batt_temp %d < known temp range for pc\n", batt_temp);
+		batt_temp = chip->pc_temp_ocv_lut->temp[0];
+	}
+	if (batt_temp > chip->pc_temp_ocv_lut->temp[cols - 1]) {
+		pr_debug("batt_temp %d > known temp range for pc\n", batt_temp);
+		batt_temp = chip->pc_temp_ocv_lut->temp[cols - 1];
+	}
+
+	for (j = 0; j < cols; j++)
+		if (batt_temp <= chip->pc_temp_ocv_lut->temp[j])
+			break;
+	if (batt_temp == chip->pc_temp_ocv_lut->temp[j]) {
+		
+		if (ocv >= chip->pc_temp_ocv_lut->ocv[0][j])
+			return chip->pc_temp_ocv_lut->percent[0];
+		if (ocv <= chip->pc_temp_ocv_lut->ocv[rows - 1][j])
+			return chip->pc_temp_ocv_lut->percent[rows - 1];
+		for (i = 0; i < rows; i++) {
+			if (ocv >= chip->pc_temp_ocv_lut->ocv[i][j]) {
+				if (ocv == chip->pc_temp_ocv_lut->ocv[i][j])
+					return
+					chip->pc_temp_ocv_lut->percent[i];
+				pc = linear_interpolate(
+					chip->pc_temp_ocv_lut->percent[i],
+					chip->pc_temp_ocv_lut->ocv[i][j],
+					chip->pc_temp_ocv_lut->percent[i - 1],
+					chip->pc_temp_ocv_lut->ocv[i - 1][j],
+					ocv);
+				return pc;
+			}
+		}
+	}
+
+	if (ocv >= chip->pc_temp_ocv_lut->ocv[0][j])
+		return chip->pc_temp_ocv_lut->percent[0];
+	if (ocv <= chip->pc_temp_ocv_lut->ocv[rows - 1][j - 1])
+		return chip->pc_temp_ocv_lut->percent[rows - 1];
+
+	pcj_minus_one = 0;
+	pcj = 0;
+	for (i = 0; i < rows-1; i++) {
+		if (pcj == 0
+			&& is_between(chip->pc_temp_ocv_lut->ocv[i][j],
+				chip->pc_temp_ocv_lut->ocv[i+1][j], ocv)) {
+			pcj = linear_interpolate(
+				chip->pc_temp_ocv_lut->percent[i],
+				chip->pc_temp_ocv_lut->ocv[i][j],
+				chip->pc_temp_ocv_lut->percent[i + 1],
+				chip->pc_temp_ocv_lut->ocv[i+1][j],
+				ocv);
+		}
+
+		if (pcj_minus_one == 0
+			&& is_between(chip->pc_temp_ocv_lut->ocv[i][j-1],
+				chip->pc_temp_ocv_lut->ocv[i+1][j-1], ocv)) {
+
+			pcj_minus_one = linear_interpolate(
+				chip->pc_temp_ocv_lut->percent[i],
+				chip->pc_temp_ocv_lut->ocv[i][j-1],
+				chip->pc_temp_ocv_lut->percent[i + 1],
+				chip->pc_temp_ocv_lut->ocv[i+1][j-1],
+				ocv);
+		}
+
+		if (pcj && pcj_minus_one) {
+			pc = linear_interpolate(
+				pcj_minus_one,
+				chip->pc_temp_ocv_lut->temp[j-1],
+				pcj,
+				chip->pc_temp_ocv_lut->temp[j],
+				batt_temp);
+			return pc;
+		}
+	}
+
+	if (pcj)
+		return pcj;
+
+	if (pcj_minus_one)
+		return pcj_minus_one;
+
+	pr_debug("%d ocv wasn't found for temp %d in the LUT returning 100%%",
+							ocv, batt_temp);
+	return 100;
+}
+
+#define BMS_MODE_BIT			BIT(6)
+#define EN_VBAT_BIT				BIT(5)
+#define OVERRIDE_MODE_DELAY_MS	20
+int pm8921_bms_get_simultaneous_battery_voltage_and_current(int *ibat_ua,
+								int *vbat_uv)
+{
+	int16_t vsense_raw;
+	int16_t vbat_raw;
+	int vsense_uv, usb_chg;
+
+	if (the_chip == NULL) {
+		pr_err("Called to early\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&the_chip->bms_output_lock);
+
+	pm8xxx_writeb(the_chip->dev->parent, BMS_S1_DELAY, 0x00);
+	pm_bms_masked_write(the_chip, BMS_CONTROL,
+			BMS_MODE_BIT | EN_VBAT_BIT, BMS_MODE_BIT | EN_VBAT_BIT);
+
+	msleep(OVERRIDE_MODE_DELAY_MS);
+
+	pm_bms_lock_output_data(the_chip);
+	pm_bms_read_output_data(the_chip, VSENSE_AVG, &vsense_raw);
+	pm_bms_read_output_data(the_chip, VBATT_AVG, &vbat_raw);
+	pm_bms_unlock_output_data(the_chip);
+	pm_bms_masked_write(the_chip, BMS_CONTROL,
+			BMS_MODE_BIT | EN_VBAT_BIT, 0);
+
+	pm8xxx_writeb(the_chip->dev->parent, BMS_S1_DELAY, 0x0B);
+
+	mutex_unlock(&the_chip->bms_output_lock);
+
+	usb_chg = usb_chg_plugged_in();
+	convert_vbatt_raw_to_uv(the_chip, usb_chg, vbat_raw, vbat_uv);
+	convert_vsense_to_uv(the_chip, vsense_raw, &vsense_uv);
+	*ibat_ua = vsense_uv * 1000 / (int)the_chip->r_sense;
+
+	pr_debug("vsense_raw = 0x%x vbat_raw = 0x%x"
+			" ibat_ua = %d vbat_uv = %d\n",
+			(uint16_t)vsense_raw, (uint16_t)vbat_raw,
+			*ibat_ua, *vbat_uv);
+	return 0;
+}
+EXPORT_SYMBOL(pm8921_bms_get_simultaneous_battery_voltage_and_current);
+
+static int read_rbatt_params_raw(struct pm8921_bms_chip *chip,
+				struct pm8921_rbatt_params *raw)
+{
+	int usb_chg;
+
+	mutex_lock(&chip->bms_output_lock);
+	pm_bms_lock_output_data(chip);
+
+	pm_bms_read_output_data(chip,
+			OCV_FOR_RBATT, &raw->ocv_for_rbatt_raw);
+	pm_bms_read_output_data(chip,
+			VBATT_FOR_RBATT, &raw->vbatt_for_rbatt_raw);
+	pm_bms_read_output_data(chip,
+			VSENSE_FOR_RBATT, &raw->vsense_for_rbatt_raw);
+
+	pm_bms_unlock_output_data(chip);
+	mutex_unlock(&chip->bms_output_lock);
+
+	usb_chg = usb_chg_plugged_in();
+	convert_vbatt_raw_to_uv(chip, usb_chg,
+			raw->vbatt_for_rbatt_raw, &raw->vbatt_for_rbatt_uv);
+	convert_vbatt_raw_to_uv(chip, usb_chg,
+			raw->ocv_for_rbatt_raw, &raw->ocv_for_rbatt_uv);
+	convert_vsense_to_uv(chip,
+			raw->vsense_for_rbatt_raw, &raw->vsense_for_rbatt_uv);
+
+	pr_debug("vbatt_for_rbatt_raw = 0x%x, vbatt_for_rbatt= %duV\n",
+			raw->vbatt_for_rbatt_raw, raw->vbatt_for_rbatt_uv);
+	pr_debug("ocv_for_rbatt_raw = 0x%x, ocv_for_rbatt= %duV\n",
+			raw->ocv_for_rbatt_raw, raw->ocv_for_rbatt_uv);
+	pr_debug("vsense_for_rbatt_raw = 0x%x, vsense_for_rbatt= %duV\n",
+			raw->vsense_for_rbatt_raw, raw->vsense_for_rbatt_uv);
+	return 0;
+}
+
+#define MBG_TRANSIENT_ERROR_RAW 51
+static void adjust_pon_ocv_raw(struct pm8921_bms_chip *chip,
+				struct pm8921_soc_params *raw)
+{
+	if (raw->last_good_ocv_raw >= MBG_TRANSIENT_ERROR_RAW)
+		raw->last_good_ocv_raw -= MBG_TRANSIENT_ERROR_RAW;
+}
+
+static int read_soc_params_raw(struct pm8921_bms_chip *chip,
+				struct pm8921_soc_params *raw)
+{
+	int usb_chg, rc;
+	uint16_t	last_good_ocv_raw_ori = 0; 
+	int		last_good_ocv_uv_ori_uv = 0; 
+	u8 ocv_updated_flag = 0;
+
+	rc = pm8xxx_readb(chip->dev->parent, OCV_UPDATE_STORAGE, &ocv_updated_flag);
+	if (rc) {
+		pr_err("%s: failed to read addr = %d, rc=%d\n",
+				__func__, OCV_UPDATE_STORAGE, rc);
+	} else {
+		ocv_updated_flag &= OCV_UPDATE_STORAGE_USE_MASK;
+		pr_debug("%s: OCV_UPDATE_STORAGE = 0x%x\n", __func__, ocv_updated_flag);
+	}
+
+	mutex_lock(&chip->bms_output_lock);
+	pm_bms_lock_output_data(chip);
+
+	pm_bms_read_output_data(chip,
+			LAST_GOOD_OCV_VALUE, &raw->last_good_ocv_raw);
+	read_cc(chip, &raw->cc);
+
+	pm_bms_unlock_output_data(chip);
+	mutex_unlock(&chip->bms_output_lock);
+
+	usb_chg =  usb_chg_plugged_in();
+	pr_debug("%s: usb_chg=%d, usb_chg_plugged_ready=%d,"
+			"prev_last_good_ocv_raw=0x%x, last_good_ocv_raw=0x%x\n",
+			__func__, usb_chg, chip->usb_chg_plugged_ready,
+			chip->prev_last_good_ocv_raw, raw->last_good_ocv_raw);
+	if (chip->prev_last_good_ocv_raw == 0) {
+		if (chip->usb_chg_plugged_ready == 1)
+			chip->prev_last_good_ocv_raw = raw->last_good_ocv_raw;
+		last_good_ocv_raw_ori = raw->last_good_ocv_raw;
+		if (!ocv_updated_flag)
+			adjust_pon_ocv_raw(chip, raw);
+		else
+			pr_info("%s: Skip adjust_pon_ocv_raw due to ocv_updated_flag=0x%x\n",
+					__func__, ocv_updated_flag);
+		convert_vbatt_raw_to_uv(chip, usb_chg,
+			raw->last_good_ocv_raw, &raw->last_good_ocv_uv);
+		convert_vbatt_raw_to_uv(chip, usb_chg,
+			last_good_ocv_raw_ori, &last_good_ocv_uv_ori_uv);
+		last_ocv_uv = raw->last_good_ocv_uv;
+		pr_info("%s: last_good_ocv_raw/ori=0x%x/0x%x, last_good_ocv_uv/ori=%duV/%duV\n",
+				__func__, raw->last_good_ocv_raw, last_good_ocv_raw_ori,
+				raw->last_good_ocv_uv, last_good_ocv_uv_ori_uv);
+	} else if (chip->prev_last_good_ocv_raw != raw->last_good_ocv_raw) {
+		chip->prev_last_good_ocv_raw = raw->last_good_ocv_raw;
+		convert_vbatt_raw_to_uv(chip, usb_chg,
+			raw->last_good_ocv_raw, &raw->last_good_ocv_uv);
+		last_ocv_uv = raw->last_good_ocv_uv;
+		pm_bms_masked_write(chip, OCV_UPDATE_STORAGE,
+							OCV_UPDATE_STORAGE_USE_MASK, 0x1);
+		rc = pm8xxx_readb(chip->dev->parent, OCV_UPDATE_STORAGE, &ocv_updated_flag);
+		if (rc) {
+			pr_err("%s: failed to read addr = %d, rc=%d\n",
+					__func__, OCV_UPDATE_STORAGE, rc);
+		} else {
+			ocv_updated_flag &= OCV_UPDATE_STORAGE_USE_MASK;
+		}
+		pr_info("%s: last_good_ocv_raw/uv=0x%x/%duV, ocv_updated_flag=0x%x\n",
+				__func__, raw->last_good_ocv_raw, raw->last_good_ocv_uv,
+				ocv_updated_flag);
+	} else {
+		raw->last_good_ocv_uv = last_ocv_uv;
+	}
+
+	pr_debug("0p625 = %duV\n", chip->xoadc_v0625);
+	pr_debug("1p25 = %duV\n", chip->xoadc_v125);
+	pr_debug("last_good_ocv_raw= 0x%x, last_good_ocv_uv= %duV\n",
+			raw->last_good_ocv_raw, raw->last_good_ocv_uv);
+	pr_debug("cc_raw= 0x%x\n", raw->cc);
+	return 0;
+}
+
+static int get_rbatt(struct pm8921_bms_chip *chip, int soc_rbatt, int batt_temp)
+{
+	int rbatt, scalefactor;
+
+	rbatt = (last_rbatt < 0) ? chip->default_rbatt_mohm : last_rbatt;
+	pr_debug("rbatt before scaling = %d\n", rbatt);
+	if (chip->rbatt_sf_lut == NULL)  {
+		pr_debug("RBATT = %d\n", rbatt);
+		return rbatt;
+	}
+
+	
+	batt_temp = batt_temp / 10;
+	scalefactor = interpolate_scalingfactor(chip, chip->rbatt_sf_lut,
+							batt_temp, soc_rbatt);
+	bms_dbg.rbatt_sf = scalefactor;
+	bms_dbg.soc_rbatt = soc_rbatt;
+	pr_debug("rbatt sf = %d for batt_temp = %d, soc_rbatt = %d\n",
+				scalefactor, batt_temp, soc_rbatt);
+	rbatt = (rbatt * scalefactor) / 100;
+
+	rbatt += the_chip->rconn_mohm;
+	pr_debug("adding rconn_mohm = %d rbatt = %d\n",
+				the_chip->rconn_mohm, rbatt);
+
+	if (is_between(20, 10, soc_rbatt))
+		rbatt = rbatt
+			+ ((20 - soc_rbatt) * chip->delta_rbatt_mohm) / 10;
+	else
+		if (is_between(10, 0, soc_rbatt))
+			rbatt = rbatt + chip->delta_rbatt_mohm;
+
+	pr_debug("RBATT = %d\n", rbatt);
+	return rbatt;
+}
+
+static int calculate_rbatt_resume(struct pm8921_bms_chip *chip,
+				struct pm8921_rbatt_params *raw)
+{
+	unsigned int  r_batt;
+
+	if (raw->ocv_for_rbatt_uv <= 0
+		|| raw->ocv_for_rbatt_uv <= raw->vbatt_for_rbatt_uv
+		|| raw->vsense_for_rbatt_raw <= 0) {
+		pr_debug("rbatt readings unavailable ocv = %d, vbatt = %d,"
+					"vsen = %d\n",
+					raw->ocv_for_rbatt_uv,
+					raw->vbatt_for_rbatt_uv,
+					raw->vsense_for_rbatt_raw);
+		return -EINVAL;
+	}
+	r_batt = ((raw->ocv_for_rbatt_uv - raw->vbatt_for_rbatt_uv)
+			* chip->r_sense) / raw->vsense_for_rbatt_uv;
+	pr_debug("r_batt = %umilliOhms", r_batt);
+	return r_batt;
+}
+
+static int calculate_fcc_uah(struct pm8921_bms_chip *chip, int batt_temp,
+							int chargecycles)
+{
+	int initfcc, result, scalefactor = 0;
+
+	if (chip->adjusted_fcc_temp_lut == NULL) {
+		initfcc = interpolate_fcc(chip, batt_temp);
+
+		scalefactor = interpolate_scalingfactor_fcc(chip, chargecycles);
+
+		
+		result = (initfcc * scalefactor * 1000) / 100;
+		pr_debug("fcc = %d uAh\n", result);
+		return result;
+	} else {
+		return 1000 * interpolate_fcc_adjusted(chip, batt_temp);
+	}
+}
+
+static int get_battery_uvolts(struct pm8921_bms_chip *chip, int *uvolts)
+{
+	int rc;
+	struct pm8xxx_adc_chan_result result;
+
+	rc = pm8xxx_adc_read(chip->vbat_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					chip->vbat_channel, rc);
+		return rc;
+	}
+	pr_debug("mvolts phy = %lld meas = 0x%llx", result.physical,
+						result.measurement);
+	*uvolts = (int)result.physical;
+	return 0;
+}
+
+static int adc_based_ocv(struct pm8921_bms_chip *chip, int *ocv)
+{
+	int vbatt, rbatt, ibatt_ua, rc;
+
+	rc = get_battery_uvolts(chip, &vbatt);
+	if (rc) {
+		pr_err("failed to read vbatt from adc rc = %d\n", rc);
+		return rc;
+	}
+
+	rc =  pm8921_bms_get_battery_current(&ibatt_ua);
+	if (rc) {
+		pr_err("failed to read batt current rc = %d\n", rc);
+		return rc;
+	}
+
+	rbatt = (last_rbatt < 0) ? chip->default_rbatt_mohm : last_rbatt;
+	*ocv = vbatt + (ibatt_ua * rbatt)/1000;
+	return 0;
+}
+
+static int calculate_pc(struct pm8921_bms_chip *chip, int ocv_uv, int batt_temp,
+							int chargecycles)
+{
+	int pc, scalefactor;
+
+	pc = interpolate_pc(chip, batt_temp, ocv_uv / 1000);
+	pr_debug("pc = %u for ocv = %dmicroVolts batt_temp = %d\n",
+					pc, ocv_uv, batt_temp);
+
+	scalefactor = interpolate_scalingfactor(chip,
+					chip->pc_sf_lut, chargecycles, pc);
+	pr_debug("scalefactor = %u batt_temp = %d\n", scalefactor, batt_temp);
+
+	bms_dbg.scalefactor = scalefactor;
+	
+	pc = (pc * scalefactor) / 100;
+	return pc;
+}
+
+static void calculate_cc_uah(struct pm8921_bms_chip *chip, int cc, int *val)
+{
+	int64_t cc_voltage_uv, cc_nvh, cc_uah;
+
+	cc_voltage_uv = cc;
+	cc_voltage_uv -= chip->cc_reading_at_100;
+	pr_debug("cc = %d. after subtracting %d cc = %lld\n",
+					cc, chip->cc_reading_at_100,
+					cc_voltage_uv);
+	cc_voltage_uv = cc_to_microvolt(chip, cc_voltage_uv);
+	cc_voltage_uv = pm8xxx_cc_adjust_for_gain(cc_voltage_uv);
+	pr_debug("cc_voltage_uv = %lld microvolts\n", cc_voltage_uv);
+	cc_nvh = ccmicrovolt_to_nvh(cc_voltage_uv);
+	pr_debug("cc_nvh = %lld nano_volt_hour\n", cc_nvh);
+	cc_uah = div_s64(cc_nvh, chip->r_sense);
+	*val = cc_uah;
+}
+
+static int calculate_unusable_charge_uah(struct pm8921_bms_chip *chip,
+				int rbatt, int fcc_uah,
+				int batt_temp, int chargecycles)
+{
+	int voltage_unusable_uv, pc_unusable;
+
+	
+	voltage_unusable_uv = (rbatt * chip->i_test)
+						+ (chip->v_failure * 1000);
+	pc_unusable = calculate_pc(chip, voltage_unusable_uv,
+						batt_temp, chargecycles);
+	pr_debug("rbatt = %umilliOhms unusable_v =%d unusable_pc = %d\n",
+			rbatt, voltage_unusable_uv, pc_unusable);
+	bms_dbg.rbatt = rbatt;
+	bms_dbg.voltage_unusable_uv = voltage_unusable_uv;
+	bms_dbg.pc_unusable = pc_unusable;
+	return (fcc_uah * pc_unusable) / 100;
+}
+
+static int calculate_remaining_charge_uah(struct pm8921_bms_chip *chip,
+						struct pm8921_soc_params *raw,
+						int fcc_uah, int batt_temp,
+						int chargecycles)
+{
+	int ocv, pc;
+
+	
+	ocv = 0;
+	if (chip->ocv_reading_at_100 != raw->last_good_ocv_raw) {
+		chip->ocv_reading_at_100 = 0;
+		chip->cc_reading_at_100 = 0;
+		ocv = raw->last_good_ocv_uv;
+	} else {
+		ocv = chip->max_voltage_uv;
+	}
+
+	if (ocv == 0) {
+		ocv = last_ocv_uv;
+		pr_debug("ocv not available using last_ocv_uv=%d\n", ocv);
+	}
+
+	pc = calculate_pc(chip, ocv, batt_temp, chargecycles);
+	bms_dbg.rc_pc = pc;
+	pr_debug("ocv = %d pc = %d\n", ocv, pc);
+	return (fcc_uah * pc) / 100;
+}
+
+static void calculate_soc_params(struct pm8921_bms_chip *chip,
+						struct pm8921_soc_params *raw,
+						int batt_temp, int chargecycles,
+						int *fcc_uah,
+						int *unusable_charge_uah,
+						int *remaining_charge_uah,
+						int *cc_uah,
+						int *rbatt)
+{
+	unsigned long flags;
+	int soc_rbatt;
+
+	*fcc_uah = calculate_fcc_uah(chip, batt_temp, chargecycles);
+	pr_debug("FCC = %uuAh batt_temp = %d, cycles = %d\n",
+					*fcc_uah, batt_temp, chargecycles);
+
+	spin_lock_irqsave(&chip->bms_100_lock, flags);
+	
+	*remaining_charge_uah = calculate_remaining_charge_uah(chip, raw,
+					*fcc_uah, batt_temp, chargecycles);
+	pr_debug("RC = %uuAh\n", *remaining_charge_uah);
+
+	
+	calculate_cc_uah(chip, raw->cc, cc_uah);
+	pr_debug("cc_uah = %duAh raw->cc = %x cc = %lld after subtracting %d\n",
+				*cc_uah, raw->cc,
+				(int64_t)raw->cc - chip->cc_reading_at_100,
+				chip->cc_reading_at_100);
+	spin_unlock_irqrestore(&chip->bms_100_lock, flags);
+
+	soc_rbatt = ((*remaining_charge_uah - *cc_uah) * 100) / *fcc_uah;
+	if (soc_rbatt < 0)
+		soc_rbatt = 0;
+	*rbatt = get_rbatt(chip, soc_rbatt, batt_temp);
+
+	*unusable_charge_uah = calculate_unusable_charge_uah(chip, *rbatt,
+					*fcc_uah, batt_temp, chargecycles);
+	pr_debug("UUC = %uuAh\n", *unusable_charge_uah);
+}
+
+static int calculate_real_fcc_uah(struct pm8921_bms_chip *chip,
+				struct pm8921_soc_params *raw,
+				int batt_temp, int chargecycles,
+				int *ret_fcc_uah)
+{
+	int fcc_uah, unusable_charge_uah;
+	int remaining_charge_uah;
+	int cc_uah;
+	int real_fcc_uah;
+	int rbatt;
+
+	calculate_soc_params(chip, raw, batt_temp, chargecycles,
+						&fcc_uah,
+						&unusable_charge_uah,
+						&remaining_charge_uah,
+						&cc_uah,
+						&rbatt);
+
+	real_fcc_uah = remaining_charge_uah - cc_uah;
+	*ret_fcc_uah = fcc_uah;
+	pr_debug("real_fcc = %d, RC = %d CC = %d fcc = %d\n",
+			real_fcc_uah, remaining_charge_uah, cc_uah, fcc_uah);
+	return real_fcc_uah;
+}
+static int calculate_state_of_charge(struct pm8921_bms_chip *chip,
+					struct pm8921_soc_params *raw,
+					int batt_temp, int chargecycles, int verbol)
+{
+	int remaining_usable_charge_uah, fcc_uah, unusable_charge_uah;
+	int remaining_charge_uah, soc, soc_remainder = 0;
+	int update_userspace = 1;
+	int cc_uah;
+	int rbatt;
+
+	calculate_soc_params(chip, raw, batt_temp, chargecycles,
+						&fcc_uah,
+						&unusable_charge_uah,
+						&remaining_charge_uah,
+						&cc_uah,
+						&rbatt);
+	bms_dbg.batt_temp = batt_temp;
+
+	
+	remaining_usable_charge_uah = remaining_charge_uah
+					- cc_uah
+					- unusable_charge_uah;
+
+	pr_debug("RUC = %duAh\n", remaining_usable_charge_uah);
+	if (fcc_uah - unusable_charge_uah <= 0) {
+		pr_warn("FCC = %duAh, UUC = %duAh forcing soc = 0\n",
+						fcc_uah, unusable_charge_uah);
+		soc = 0;
+	} else {
+		soc = (remaining_usable_charge_uah * 100)
+			/ (fcc_uah - unusable_charge_uah);
+		soc_remainder = (remaining_usable_charge_uah * 100)
+			% (fcc_uah - unusable_charge_uah);
+		
+		if (soc >= 0 && soc_remainder > 0)
+			soc += 1;
+	}
+
+	if (verbol) {
+		pr_info("FCC=%d,UC=%d,RC=%d,CC=%d,RUC=%d,SOC=%d,SOC_R=%d,"
+			       "start_percent=%d,end_percent=%d,"
+			       "rbatt=%d,rbatt_sf=%d,batt_temp=%d,soc_rbatt=%d,last_rbatt=%d,"
+			       "V_unusable_uv=%d,pc_unusable=%d,rc_pc=%d,scalefactor=%d\n",
+				fcc_uah, unusable_charge_uah, remaining_charge_uah,
+				cc_uah, remaining_usable_charge_uah, soc, soc_remainder,
+				the_chip->start_percent, the_chip->end_percent,
+				bms_dbg.rbatt, bms_dbg.rbatt_sf, bms_dbg.batt_temp,
+				bms_dbg.soc_rbatt, last_rbatt, bms_dbg.voltage_unusable_uv,
+				bms_dbg.pc_unusable, bms_dbg.rc_pc, bms_dbg.scalefactor);
+	}
+
+	if (soc > 100)
+		soc = 100;
+	pr_debug("SOC = %u%%\n", soc);
+
+	if (bms_fake_battery != -EINVAL) {
+		pr_debug("Returning Fake SOC = %d%%\n", bms_fake_battery);
+		return bms_fake_battery;
+	}
+
+	if (soc < 0) {
+		pr_err("bad rem_usb_chg = %d rem_chg %d,"
+				"cc_uah %d, unusb_chg %d\n",
+				remaining_usable_charge_uah,
+				remaining_charge_uah,
+				cc_uah, unusable_charge_uah);
+
+		pr_err("for bad rem_usb_chg last_ocv_uv = %d"
+				"chargecycles = %d, batt_temp = %d"
+				"fcc = %d soc =%d\n",
+				last_ocv_uv, chargecycles, batt_temp,
+				fcc_uah, soc);
+		update_userspace = 0;
+		soc = 0;
+	}
+
+	if (last_soc == -EINVAL || soc <= last_soc) {
+		last_soc = update_userspace ? soc : last_soc;
+		return soc;
+	}
+
+	if (the_chip->start_percent != -EINVAL) {
+		last_soc = soc;
+	} else {
+		pr_info("soc = %d reporting last_soc = %d\n", soc, last_soc);
+		soc = last_soc;
+	}
+
+
+	return soc;
+}
+
+#define MIN_DELTA_625_UV	1000
+static void calib_hkadc(struct pm8921_bms_chip *chip)
+{
+	int voltage, rc;
+	struct pm8xxx_adc_chan_result result;
+	int usb_chg;
+	int this_delta;
+
+	rc = pm8xxx_adc_read(the_chip->ref1p25v_channel, &result);
+	if (rc) {
+		pr_err("ADC failed for 1.25volts rc = %d\n", rc);
+		return;
+	}
+	voltage = xoadc_reading_to_microvolt(result.adc_code);
+
+	pr_debug("result 1.25v = 0x%x, voltage = %duV adc_meas = %lld\n",
+				result.adc_code, voltage, result.measurement);
+
+	chip->xoadc_v125 = voltage;
+
+	rc = pm8xxx_adc_read(the_chip->ref625mv_channel, &result);
+	if (rc) {
+		pr_err("ADC failed for 1.25volts rc = %d\n", rc);
+		return;
+	}
+	voltage = xoadc_reading_to_microvolt(result.adc_code);
+
+	usb_chg = usb_chg_plugged_in();
+	pr_debug("result 0.625V = 0x%x, voltage = %duV adc_meas = %lld "
+				"usb_chg = %d\n",
+				result.adc_code, voltage, result.measurement,
+				usb_chg);
+
+	if (usb_chg)
+		chip->xoadc_v0625_usb_present = voltage;
+	else
+		chip->xoadc_v0625_usb_absent = voltage;
+
+	chip->xoadc_v0625 = voltage;
+	if (chip->xoadc_v0625_usb_present && chip->xoadc_v0625_usb_absent) {
+		this_delta = chip->xoadc_v0625_usb_present
+						- chip->xoadc_v0625_usb_absent;
+		pr_debug("this_delta= %duV\n", this_delta);
+		if (this_delta > MIN_DELTA_625_UV)
+			last_usb_cal_delta_uv = this_delta;
+		pr_debug("625V_present= %d, 625V_absent= %d, delta = %duV\n",
+			chip->xoadc_v0625_usb_present,
+			chip->xoadc_v0625_usb_absent,
+			last_usb_cal_delta_uv);
+	}
+}
+
+static void calibrate_hkadc_work(struct work_struct *work)
+{
+	struct pm8921_bms_chip *chip = container_of(work,
+				struct pm8921_bms_chip, calib_hkadc_work);
+
+	calib_hkadc(chip);
+}
+
+void pm8921_bms_calibrate_hkadc(void)
+{
+	schedule_work(&the_chip->calib_hkadc_work);
+}
+
+int pm8921_bms_get_vsense_avg(int *result)
+{
+	int rc = -EINVAL;
+
+	if (the_chip) {
+		mutex_lock(&the_chip->bms_output_lock);
+		pm_bms_lock_output_data(the_chip);
+		rc = read_vsense_avg(the_chip, result);
+		pm_bms_unlock_output_data(the_chip);
+		mutex_unlock(&the_chip->bms_output_lock);
+	} else
+		pr_err("called before initialization\n");
+	return rc;
+}
+EXPORT_SYMBOL(pm8921_bms_get_vsense_avg);
+
+int pm8921_bms_get_battery_current(int *result_ua)
+{
+	int vsense;
+
+	if (!the_chip) {
+		pr_err("called before initialization\n");
+		return -EINVAL;
+	}
+	if (the_chip->r_sense == 0) {
+		pr_err("r_sense is zero\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&the_chip->bms_output_lock);
+	pm_bms_lock_output_data(the_chip);
+	read_vsense_avg(the_chip, &vsense);
+	pm_bms_unlock_output_data(the_chip);
+	mutex_unlock(&the_chip->bms_output_lock);
+	pr_debug("vsense=%duV\n", vsense);
+	
+	*result_ua = vsense * 1000 / (int)the_chip->r_sense;
+	pr_debug("ibat=%duA\n", *result_ua);
+	return 0;
+}
+EXPORT_SYMBOL(pm8921_bms_get_battery_current);
+
+int pm8921_bms_get_percent_charge(void)
+{
+	int batt_temp, rc;
+	struct pm8xxx_adc_chan_result result;
+	struct pm8921_soc_params raw;
+
+	if (!the_chip) {
+		pr_err("called before initialization\n");
+		return -EINVAL;
+	}
+
+	rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					the_chip->batt_temp_channel, rc);
+		return rc;
+	}
+	pr_debug("batt_temp phy = %lld meas = 0x%llx", result.physical,
+						result.measurement);
+	batt_temp = (int)result.physical;
+
+	read_soc_params_raw(the_chip, &raw);
+
+	return calculate_state_of_charge(the_chip, &raw,
+					batt_temp, last_chargecycles, 0);
+}
+EXPORT_SYMBOL_GPL(pm8921_bms_get_percent_charge);
+
+int pm8921_bms_get_rbatt(void)
+{
+	int batt_temp, rc;
+	struct pm8xxx_adc_chan_result result;
+	struct pm8921_soc_params raw;
+	int fcc_uah;
+	int unusable_charge_uah;
+	int remaining_charge_uah;
+	int cc_uah;
+	int rbatt;
+
+	if (!the_chip) {
+		pr_err("called before initialization\n");
+		return -EINVAL;
+	}
+
+	rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					the_chip->batt_temp_channel, rc);
+		return rc;
+	}
+	pr_debug("batt_temp phy = %lld meas = 0x%llx\n", result.physical,
+						result.measurement);
+	batt_temp = (int)result.physical;
+
+	read_soc_params_raw(the_chip, &raw);
+
+	calculate_soc_params(the_chip, &raw, batt_temp, last_chargecycles,
+						&fcc_uah,
+						&unusable_charge_uah,
+						&remaining_charge_uah,
+						&cc_uah,
+						&rbatt);
+	return rbatt;
+}
+EXPORT_SYMBOL_GPL(pm8921_bms_get_rbatt);
+
+int pm8921_bms_get_fcc(void)
+{
+	int batt_temp, rc;
+	struct pm8xxx_adc_chan_result result;
+
+	if (!the_chip) {
+		pr_err("called before initialization\n");
+		return -EINVAL;
+	}
+
+	rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					the_chip->batt_temp_channel, rc);
+		return rc;
+	}
+	pr_debug("batt_temp phy = %lld meas = 0x%llx", result.physical,
+						result.measurement);
+	batt_temp = (int)result.physical;
+	return calculate_fcc_uah(the_chip, batt_temp, last_chargecycles);
+}
+EXPORT_SYMBOL_GPL(pm8921_bms_get_fcc);
+
+#ifdef CONFIG_HTC_BATT_8960
+int pm8921_bms_get_batt_current(int *result)
+{
+	return pm8921_bms_get_battery_current(result);
+}
+
+int pm8921_bms_get_batt_soc(int *result)
+{
+	int batt_temp, rc;
+	struct pm8xxx_adc_chan_result temp_result;
+	struct pm8921_soc_params raw;
+
+	if (!the_chip) {
+		pr_err("called before initialization\n");
+		return -EINVAL;
+	}
+
+	rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &temp_result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					the_chip->batt_temp_channel, rc);
+		return rc;
+	}
+	pr_debug("batt_temp phy = %lld meas = 0x%llx", temp_result.physical,
+						temp_result.measurement);
+	batt_temp = (int)temp_result.physical;
+
+	read_soc_params_raw(the_chip, &raw);
+
+	*result = calculate_state_of_charge(the_chip, &raw,
+					batt_temp, last_chargecycles, 1);
+	if (bms_discharge_percent &&
+			((bms_discharge_percent - *result) >= 5)) {
+		pr_info("OCV can be update due to %d - %d >= 5\n",
+				bms_discharge_percent, *result);
+		bms_discharge_percent = 0;
+		pm8921_bms_start_ocv_updates();
+	}
+
+	return 0;
+}
+
+int pm8921_bms_get_batt_cc(int *result)
+{
+	*result = dump_cc_uah();
+
+	return 0;
+}
+#endif 
+
+#define IBAT_TOL_MASK		0x0F
+#define OCV_TOL		0xF0
+#define OCV_TOL_MASK			0xF0
+#define IBAT_TOL_DEFAULT	0x03
+#define IBAT_TOL_NOCHG		0x0F
+#define OCV_TOL_DEFAULT		0x20
+#define OCV_TOL_NO_OCV		0x00
+int pm8921_bms_charging_began(void)
+{
+	int batt_temp, rc = 0;
+	struct pm8xxx_adc_chan_result result;
+	struct pm8921_soc_params raw;
+
+	if (!the_chip) {
+		pr_err("called before initialization\n");
+		return -EINVAL;
+	}
+
+	rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+				the_chip->batt_temp_channel, rc);
+		return rc;
+	}
+	pr_debug("batt_temp phy = %lld meas = 0x%llx\n", result.physical,
+						result.measurement);
+	batt_temp = (int)result.physical;
+
+	read_soc_params_raw(the_chip, &raw);
+
+	the_chip->start_percent = calculate_state_of_charge(the_chip, &raw,
+					batt_temp, last_chargecycles, 0);
+	bms_start_percent = the_chip->start_percent;
+	bms_start_ocv_uv = raw.last_good_ocv_uv;
+	calculate_cc_uah(the_chip, raw.cc, &bms_start_cc_uah);
+	pm_bms_masked_write(the_chip, BMS_TOLERANCES,
+			IBAT_TOL_MASK, IBAT_TOL_DEFAULT);
+	pr_info("start_percent = %d%%\n", the_chip->start_percent);
+	bms_discharge_percent = 0;
+	pm8921_bms_stop_ocv_updates();
+
+	return rc;
+}
+EXPORT_SYMBOL_GPL(pm8921_bms_charging_began);
+
+#define DELTA_FCC_PERCENT	3
+#define MIN_START_PERCENT_FOR_LEARNING	(-30)
+void pm8921_bms_charging_end(int is_battery_full)
+{
+	int batt_temp, rc;
+	struct pm8xxx_adc_chan_result result;
+	struct pm8921_soc_params raw;
+
+	if (the_chip == NULL)
+		return;
+
+	rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+				the_chip->batt_temp_channel, rc);
+		return;
+	}
+	pr_debug("batt_temp phy = %lld meas = 0x%llx\n", result.physical,
+						result.measurement);
+	batt_temp = (int)result.physical;
+
+	read_soc_params_raw(the_chip, &raw);
+
+	calculate_cc_uah(the_chip, raw.cc, &bms_end_cc_uah);
+
+	if (is_battery_full
+		&& the_chip->start_percent <= MIN_START_PERCENT_FOR_LEARNING) {
+		int fcc_uah, new_fcc_uah, delta_fcc_uah;
+
+		new_fcc_uah = calculate_real_fcc_uah(the_chip, &raw,
+						batt_temp, last_chargecycles,
+						&fcc_uah);
+		delta_fcc_uah = new_fcc_uah - fcc_uah;
+		if (delta_fcc_uah < 0)
+			delta_fcc_uah = -delta_fcc_uah;
+
+		if (delta_fcc_uah * 100  > (DELTA_FCC_PERCENT * fcc_uah)) {
+			
+			if (new_fcc_uah > fcc_uah)
+				new_fcc_uah
+				= (fcc_uah +
+						(DELTA_FCC_PERCENT * fcc_uah) / 100);
+			else
+				new_fcc_uah
+				= (fcc_uah -
+						(DELTA_FCC_PERCENT * fcc_uah) / 100);
+			pr_info("delta_fcc=%d > %d percent of fcc=%d"
+					"restring it to %d\n",
+					delta_fcc_uah, DELTA_FCC_PERCENT,
+					fcc_uah, new_fcc_uah);
+		}
+		last_real_fcc_mah = new_fcc_uah/1000;
+		last_real_fcc_batt_temp = batt_temp;
+		readjust_fcc_table();
+		pr_info("learnt fcc = %d batt_temp = %d\n",
+					last_real_fcc_mah, last_real_fcc_batt_temp);
+	}
+
+	
+	if (is_battery_full) {
+		unsigned long flags;
+		spin_lock_irqsave(&the_chip->bms_100_lock, flags);
+		the_chip->ocv_reading_at_100 = raw.last_good_ocv_raw;
+		the_chip->cc_reading_at_100 = raw.cc;
+		spin_unlock_irqrestore(&the_chip->bms_100_lock, flags);
+		pr_debug("EOC ocv_reading = 0x%x cc = %d\n",
+				the_chip->ocv_reading_at_100,
+				the_chip->cc_reading_at_100);
+		pm8921_bms_start_ocv_updates();
+	}
+
+	the_chip->end_percent = calculate_state_of_charge(the_chip, &raw,
+					batt_temp, last_chargecycles, 0);
+
+	bms_end_percent = the_chip->end_percent;
+	if (!is_battery_full)
+		bms_discharge_percent = the_chip->end_percent;
+	else
+		bms_discharge_percent = 0;
+	bms_end_ocv_uv = raw.last_good_ocv_uv;
+
+	if (the_chip->end_percent > the_chip->start_percent) {
+		last_charge_increase +=
+			the_chip->end_percent - the_chip->start_percent;
+		if (last_charge_increase > 100) {
+			last_chargecycles++;
+			last_charge_increase = last_charge_increase % 100;
+		}
+	}
+	pr_info("end_percent = %d%% last_charge_increase = %d"
+			"last_chargecycles = %d\n",
+			the_chip->end_percent,
+			last_charge_increase,
+			last_chargecycles);
+	the_chip->start_percent = -EINVAL;
+	the_chip->end_percent = -EINVAL;
+	pm_bms_masked_write(the_chip, BMS_TOLERANCES,
+				IBAT_TOL_MASK, IBAT_TOL_NOCHG);
+}
+EXPORT_SYMBOL_GPL(pm8921_bms_charging_end);
+
+int pm8921_bms_stop_ocv_updates(void)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	if (!is_ocv_update_start) {
+		pr_info("ocv updates is already stopped");
+		return -EINVAL;
+	}
+	is_ocv_update_start = 0;
+	pr_info("stopping ocv updates, is_ocv_update_start=%d", is_ocv_update_start);
+	return pm_bms_masked_write(the_chip, BMS_TOLERANCES,
+			OCV_TOL_MASK, OCV_TOL_NO_OCV);
+}
+EXPORT_SYMBOL_GPL(pm8921_bms_stop_ocv_updates);
+
+int pm8921_bms_start_ocv_updates(void)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	if (is_ocv_update_start) {
+		pr_info("ocv updates is already started");
+		return -EINVAL;
+	}
+	is_ocv_update_start = 1;
+	pr_info("starting ocv updates, is_ocv_update_start=%d", is_ocv_update_start);
+	return pm_bms_masked_write(the_chip, BMS_TOLERANCES,
+			OCV_TOL_MASK, OCV_TOL_DEFAULT);
+}
+EXPORT_SYMBOL_GPL(pm8921_bms_start_ocv_updates);
+
+static irqreturn_t pm8921_bms_sbi_write_ok_handler(int irq, void *data)
+{
+	pr_debug("irq = %d triggered", irq);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t pm8921_bms_cc_thr_handler(int irq, void *data)
+{
+	pr_debug("irq = %d triggered", irq);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t pm8921_bms_vsense_thr_handler(int irq, void *data)
+{
+	pr_debug("irq = %d triggered", irq);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t pm8921_bms_vsense_for_r_handler(int irq, void *data)
+{
+	pr_debug("irq = %d triggered", irq);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t pm8921_bms_ocv_for_r_handler(int irq, void *data)
+{
+	struct pm8921_bms_chip *chip = data;
+
+	pr_debug("irq = %d triggered", irq);
+	schedule_work(&chip->calib_hkadc_work);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t pm8921_bms_good_ocv_handler(int irq, void *data)
+{
+	struct pm8921_bms_chip *chip = data;
+
+	pr_debug("irq = %d triggered", irq);
+	schedule_work(&chip->calib_hkadc_work);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t pm8921_bms_vsense_avg_handler(int irq, void *data)
+{
+	pr_debug("irq = %d triggered", irq);
+	return IRQ_HANDLED;
+}
+
+struct pm_bms_irq_init_data {
+	unsigned int	irq_id;
+	char		*name;
+	unsigned long	flags;
+	irqreturn_t	(*handler)(int, void *);
+};
+
+#define BMS_IRQ(_id, _flags, _handler) \
+{ \
+	.irq_id		= _id, \
+	.name		= #_id, \
+	.flags		= _flags, \
+	.handler	= _handler, \
+}
+
+struct pm_bms_irq_init_data bms_irq_data[] = {
+	BMS_IRQ(PM8921_BMS_SBI_WRITE_OK, IRQF_TRIGGER_RISING,
+				pm8921_bms_sbi_write_ok_handler),
+	BMS_IRQ(PM8921_BMS_CC_THR, IRQF_TRIGGER_RISING,
+				pm8921_bms_cc_thr_handler),
+	BMS_IRQ(PM8921_BMS_VSENSE_THR, IRQF_TRIGGER_RISING,
+				pm8921_bms_vsense_thr_handler),
+	BMS_IRQ(PM8921_BMS_VSENSE_FOR_R, IRQF_TRIGGER_RISING,
+				pm8921_bms_vsense_for_r_handler),
+	BMS_IRQ(PM8921_BMS_OCV_FOR_R, IRQF_TRIGGER_RISING,
+				pm8921_bms_ocv_for_r_handler),
+	BMS_IRQ(PM8921_BMS_GOOD_OCV, IRQF_TRIGGER_RISING,
+				pm8921_bms_good_ocv_handler),
+	BMS_IRQ(PM8921_BMS_VSENSE_AVG, IRQF_TRIGGER_RISING,
+				pm8921_bms_vsense_avg_handler),
+};
+
+static void free_irqs(struct pm8921_bms_chip *chip)
+{
+	int i;
+
+	for (i = 0; i < PM_BMS_MAX_INTS; i++)
+		if (chip->pmic_bms_irq[i]) {
+			free_irq(chip->pmic_bms_irq[i], NULL);
+			chip->pmic_bms_irq[i] = 0;
+		}
+}
+
+static int __devinit request_irqs(struct pm8921_bms_chip *chip,
+					struct platform_device *pdev)
+{
+	struct resource *res;
+	int ret, i;
+
+	ret = 0;
+	bitmap_fill(chip->enabled_irqs, PM_BMS_MAX_INTS);
+
+	for (i = 0; i < ARRAY_SIZE(bms_irq_data); i++) {
+		res = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
+				bms_irq_data[i].name);
+		if (res == NULL) {
+			pr_err("couldn't find %s\n", bms_irq_data[i].name);
+			goto err_out;
+		}
+		ret = request_irq(res->start, bms_irq_data[i].handler,
+			bms_irq_data[i].flags,
+			bms_irq_data[i].name, chip);
+		if (ret < 0) {
+			pr_err("couldn't request %d (%s) %d\n", res->start,
+					bms_irq_data[i].name, ret);
+			goto err_out;
+		}
+		chip->pmic_bms_irq[bms_irq_data[i].irq_id] = res->start;
+		pm8921_bms_disable_irq(chip, bms_irq_data[i].irq_id);
+	}
+	return 0;
+
+err_out:
+	free_irqs(chip);
+	return -EINVAL;
+}
+
+#define EN_BMS_BIT	BIT(7)
+#define EN_PON_HS_BIT	BIT(0)
+static int __devinit pm8921_bms_hw_init(struct pm8921_bms_chip *chip)
+{
+	int rc;
+
+	rc = pm_bms_masked_write(chip, BMS_CONTROL,
+			EN_BMS_BIT | EN_PON_HS_BIT, EN_BMS_BIT | EN_PON_HS_BIT);
+	if (rc) {
+		pr_err("failed to enable pon and bms addr = %d %d",
+				BMS_CONTROL, rc);
+	}
+
+	
+	pm_bms_masked_write(chip, BMS_TOLERANCES,
+				IBAT_TOL_MASK, IBAT_TOL_NOCHG);
+
+	is_ocv_update_start = 1;
+	pm_bms_masked_write(chip, BMS_TOLERANCES,
+				OCV_TOL_MASK, OCV_TOL_DEFAULT);
+	return 0;
+}
+
+static int bms_disabled;
+static int set_disable_bms_param(const char *val, struct kernel_param *kp)
+{
+	u8 data;
+	int rc;
+	struct pm8921_bms_chip *chip = the_chip;
+
+	rc = param_set_int(val, kp);
+
+	if (rc) {
+		pr_err("error setting value %d\n", rc);
+		return rc;
+	}
+
+	if (bms_disabled)
+		data = 0;
+	else
+		data = EN_BMS_BIT | EN_PON_HS_BIT;
+
+	pr_info("set bms_disabled =%d\n", bms_disabled);
+	rc = pm_bms_masked_write(chip, BMS_CONTROL,
+			EN_BMS_BIT | EN_PON_HS_BIT, data);
+	if (rc) {
+		pr_err("failed to enable pon and bms addr = %d %d",
+				BMS_CONTROL, rc);
+	}
+
+	return 0;
+}
+module_param_call(disabled, set_disable_bms_param, param_get_uint,
+					&bms_disabled, 0644);
+
+static void check_initial_ocv(struct pm8921_bms_chip *chip)
+{
+	int ocv_uv, rc;
+	int16_t ocv_raw;
+	int usb_chg;
+
+	ocv_uv = 0;
+	pm_bms_read_output_data(chip, LAST_GOOD_OCV_VALUE, &ocv_raw);
+	usb_chg = usb_chg_plugged_in();
+	rc = convert_vbatt_raw_to_uv(chip, usb_chg, ocv_raw, &ocv_uv);
+	if (rc || ocv_uv == 0) {
+		rc = adc_based_ocv(chip, &ocv_uv);
+		if (rc) {
+			pr_err("failed to read adc based ocv_uv rc = %d\n", rc);
+			ocv_uv = DEFAULT_OCV_MICROVOLTS;
+		}
+		last_ocv_uv = ocv_uv;
+	}
+	pr_debug("ocv_uv = %d last_ocv_uv = %d\n", ocv_uv, last_ocv_uv);
+}
+
+static int64_t read_battery_id(struct pm8921_bms_chip *chip)
+{
+	int rc;
+	struct pm8xxx_adc_chan_result result;
+
+	rc = pm8xxx_adc_read(chip->batt_id_channel, &result);
+	if (rc) {
+		pr_err("error reading batt id channel = %d, rc = %d\n",
+					chip->vbat_channel, rc);
+		return rc;
+	}
+	pr_debug("batt_id phy = %lld meas = 0x%llx\n", result.physical,
+						result.measurement);
+	return result.physical;
+}
+
+#ifdef CONFIG_HTC_BATT_8960
+#define PM8921_BMS_HTC_FAKE_BATT_ID (1)
+static int set_battery_data(struct pm8921_bms_chip *chip)
+{
+	int battery_id_mv, batt_id;
+	struct pm8921_bms_battery_data* bms_battery_data;
+
+	
+	
+	if (pm8xxx_get_revision(chip->dev->parent) < PM8XXX_REVISION_8921_2p0) {
+		batt_id = PM8921_BMS_HTC_FAKE_BATT_ID;
+		htc_battery_cell_set_cur_cell_by_id(batt_id);
+	} else {
+		battery_id_mv = (int)read_battery_id(chip) / 1000;
+		
+		batt_id = htc_battery_cell_find_and_set_id_auto(battery_id_mv);
+	}
+
+	
+	bms_battery_data = htc_battery_cell_get_cur_cell_gauge_cdata();
+
+	if (bms_battery_data) {
+		pr_info("set bms_battery_data (cell_id=%d).\n",
+					batt_id);
+		chip->fcc = bms_battery_data->fcc;
+		chip->fcc_temp_lut = bms_battery_data->fcc_temp_lut;
+		chip->fcc_sf_lut = bms_battery_data->fcc_sf_lut;
+		chip->pc_temp_ocv_lut = bms_battery_data->pc_temp_ocv_lut;
+		chip->pc_sf_lut = bms_battery_data->pc_sf_lut;
+		chip->rbatt_sf_lut = bms_battery_data->rbatt_sf_lut;
+		chip->default_rbatt_mohm
+				= bms_battery_data->default_rbatt_mohm;
+		chip->delta_rbatt_mohm
+				= bms_battery_data->delta_rbatt_mohm;
+	} else {
+		pr_err("bms_battery_data doesn't exist (id=%d)\n",
+					batt_id);
+		chip->fcc = palladium_1500_data.fcc;
+		chip->fcc_temp_lut = palladium_1500_data.fcc_temp_lut;
+		chip->fcc_sf_lut = palladium_1500_data.fcc_sf_lut;
+		chip->pc_temp_ocv_lut = palladium_1500_data.pc_temp_ocv_lut;
+		chip->pc_sf_lut = palladium_1500_data.pc_sf_lut;
+		chip->rbatt_sf_lut = palladium_1500_data.rbatt_sf_lut;
+		chip->default_rbatt_mohm
+				= palladium_1500_data.default_rbatt_mohm;
+		chip->delta_rbatt_mohm
+				= palladium_1500_data.delta_rbatt_mohm;
+	}
+	return 0;
+}
+#else
+#define PALLADIUM_ID_MIN	0x7F40
+#define PALLADIUM_ID_MAX	0x7F5A
+#define DESAY_5200_ID_MIN	0x7F7F
+#define DESAY_5200_ID_MAX	0x802F
+static int set_battery_data(struct pm8921_bms_chip *chip)
+{
+	int64_t battery_id;
+
+	battery_id = read_battery_id(chip);
+
+	if (battery_id < 0) {
+		pr_err("cannot read battery id err = %lld\n", battery_id);
+		return battery_id;
+	}
+
+	if (is_between(PALLADIUM_ID_MIN, PALLADIUM_ID_MAX, battery_id)) {
+		chip->fcc = palladium_1500_data.fcc;
+		chip->fcc_temp_lut = palladium_1500_data.fcc_temp_lut;
+		chip->fcc_sf_lut = palladium_1500_data.fcc_sf_lut;
+		chip->pc_temp_ocv_lut = palladium_1500_data.pc_temp_ocv_lut;
+		chip->pc_sf_lut = palladium_1500_data.pc_sf_lut;
+		chip->rbatt_sf_lut = palladium_1500_data.rbatt_sf_lut;
+		chip->default_rbatt_mohm
+				= palladium_1500_data.default_rbatt_mohm;
+		chip->delta_rbatt_mohm
+				= palladium_1500_data.delta_rbatt_mohm;
+		return 0;
+	} else if (is_between(DESAY_5200_ID_MIN, DESAY_5200_ID_MAX,
+				battery_id)) {
+		chip->fcc = desay_5200_data.fcc;
+		chip->fcc_temp_lut = desay_5200_data.fcc_temp_lut;
+		chip->fcc_sf_lut = desay_5200_data.fcc_sf_lut;
+		chip->pc_temp_ocv_lut = desay_5200_data.pc_temp_ocv_lut;
+		chip->pc_sf_lut = desay_5200_data.pc_sf_lut;
+		chip->rbatt_sf_lut = desay_5200_data.rbatt_sf_lut;
+		chip->default_rbatt_mohm = desay_5200_data.default_rbatt_mohm;
+		chip->delta_rbatt_mohm = desay_5200_data.delta_rbatt_mohm;
+		return 0;
+	} else {
+		pr_warn("invalid battery id, palladium 1500 assumed batt_id %llx\n",
+				battery_id);
+		chip->fcc = palladium_1500_data.fcc;
+		chip->fcc_temp_lut = palladium_1500_data.fcc_temp_lut;
+		chip->fcc_sf_lut = palladium_1500_data.fcc_sf_lut;
+		chip->pc_temp_ocv_lut = palladium_1500_data.pc_temp_ocv_lut;
+		chip->pc_sf_lut = palladium_1500_data.pc_sf_lut;
+		chip->rbatt_sf_lut = palladium_1500_data.rbatt_sf_lut;
+		chip->default_rbatt_mohm
+				= palladium_1500_data.default_rbatt_mohm;
+		chip->delta_rbatt_mohm
+				= palladium_1500_data.delta_rbatt_mohm;
+		return 0;
+	}
+}
+#endif 
+
+enum bms_request_operation {
+	CALC_RBATT,
+	CALC_FCC,
+	CALC_PC,
+	CALC_SOC,
+	CALIB_HKADC,
+	CALIB_CCADC,
+	STOP_OCV,
+	START_OCV,
+	GET_VBAT_VSENSE_SIMULTANEOUS,
+};
+
+static int test_batt_temp = 5;
+static int test_chargecycle = 150;
+static int test_ocv = 3900000;
+enum {
+	TEST_BATT_TEMP,
+	TEST_CHARGE_CYCLE,
+	TEST_OCV,
+};
+static int get_test_param(void *data, u64 * val)
+{
+	switch ((int)data) {
+	case TEST_BATT_TEMP:
+		*val = test_batt_temp;
+		break;
+	case TEST_CHARGE_CYCLE:
+		*val = test_chargecycle;
+		break;
+	case TEST_OCV:
+		*val = test_ocv;
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+static int set_test_param(void *data, u64  val)
+{
+	switch ((int)data) {
+	case TEST_BATT_TEMP:
+		test_batt_temp = (int)val;
+		break;
+	case TEST_CHARGE_CYCLE:
+		test_chargecycle = (int)val;
+		break;
+	case TEST_OCV:
+		test_ocv = (int)val;
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(temp_fops, get_test_param, set_test_param, "%llu\n");
+
+static int get_calc(void *data, u64 * val)
+{
+	int param = (int)data;
+	int ret = 0;
+	int ibat_ua, vbat_uv;
+	struct pm8921_soc_params raw;
+	struct pm8921_rbatt_params rraw;
+
+	read_soc_params_raw(the_chip, &raw);
+	read_rbatt_params_raw(the_chip, &rraw);
+
+	*val = 0;
+
+	
+	switch (param) {
+	case CALC_RBATT:
+		*val = calculate_rbatt_resume(the_chip, &rraw);
+		break;
+	case CALC_FCC:
+		*val = calculate_fcc_uah(the_chip, test_batt_temp,
+							test_chargecycle);
+		break;
+	case CALC_PC:
+		*val = calculate_pc(the_chip, test_ocv, test_batt_temp,
+							test_chargecycle);
+		break;
+	case CALC_SOC:
+		*val = calculate_state_of_charge(the_chip, &raw,
+					test_batt_temp, test_chargecycle, 0);
+		break;
+	case CALIB_HKADC:
+		
+		*val = 0;
+		calib_hkadc(the_chip);
+		break;
+	case CALIB_CCADC:
+		
+		*val = 0;
+		pm8xxx_calib_ccadc();
+		break;
+	case GET_VBAT_VSENSE_SIMULTANEOUS:
+		
+		*val =
+		pm8921_bms_get_simultaneous_battery_voltage_and_current(
+			&ibat_ua,
+			&vbat_uv);
+		break;
+	default:
+		ret = -EINVAL;
+	}
+	return ret;
+}
+
+static int set_calc(void *data, u64 val)
+{
+	int param = (int)data;
+	int ret = 0;
+
+	switch (param) {
+	case STOP_OCV:
+		pm8921_bms_stop_ocv_updates();
+		break;
+	case START_OCV:
+		pm8921_bms_start_ocv_updates();
+		break;
+	default:
+		ret = -EINVAL;
+	}
+	return ret;
+}
+DEFINE_SIMPLE_ATTRIBUTE(calc_fops, get_calc, set_calc, "%llu\n");
+
+static int get_reading(void *data, u64 * val)
+{
+	int param = (int)data;
+	int ret = 0;
+	struct pm8921_soc_params raw;
+	struct pm8921_rbatt_params rraw;
+
+	read_soc_params_raw(the_chip, &raw);
+	read_rbatt_params_raw(the_chip, &rraw);
+
+	*val = 0;
+
+	switch (param) {
+	case CC_MSB:
+	case CC_LSB:
+		*val = raw.cc;
+		break;
+	case LAST_GOOD_OCV_VALUE:
+		*val = raw.last_good_ocv_uv;
+		break;
+	case VBATT_FOR_RBATT:
+		*val = rraw.vbatt_for_rbatt_uv;
+		break;
+	case VSENSE_FOR_RBATT:
+		*val = rraw.vsense_for_rbatt_uv;
+		break;
+	case OCV_FOR_RBATT:
+		*val = rraw.ocv_for_rbatt_uv;
+		break;
+	case VSENSE_AVG:
+		read_vsense_avg(the_chip, (uint *)val);
+		break;
+	default:
+		ret = -EINVAL;
+	}
+	return ret;
+}
+DEFINE_SIMPLE_ATTRIBUTE(reading_fops, get_reading, NULL, "%lld\n");
+
+static int get_rt_status(void *data, u64 * val)
+{
+	int i = (int)data;
+	int ret;
+
+	
+	ret = pm_bms_get_rt_status(the_chip, i);
+	*val = ret;
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(rt_fops, get_rt_status, NULL, "%llu\n");
+
+static int get_reg(void *data, u64 * val)
+{
+	int addr = (int)data;
+	int ret;
+	u8 temp;
+
+	ret = pm8xxx_readb(the_chip->dev->parent, addr, &temp);
+	if (ret) {
+		pr_err("pm8xxx_readb to %x value = %d errored = %d\n",
+			addr, temp, ret);
+		return -EAGAIN;
+	}
+	*val = temp;
+	return 0;
+}
+
+static int set_reg(void *data, u64 val)
+{
+	int addr = (int)data;
+	int ret;
+	u8 temp;
+
+	temp = (u8) val;
+	ret = pm8xxx_writeb(the_chip->dev->parent, addr, temp);
+	if (ret) {
+		pr_err("pm8xxx_writeb to %x value = %d errored = %d\n",
+			addr, temp, ret);
+		return -EAGAIN;
+	}
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(reg_fops, get_reg, set_reg, "0x%02llx\n");
+
+static void dump_all(void)
+{
+	u64 val;
+	
+	get_reg((void *)BMS_CONTROL, &val);
+	pr_info("BMS_CONTROL = 0x%02llx\n", val);
+	get_reg((void *)BMS_OUTPUT0, &val);
+	pr_info("BMS_OUTPUT0 = 0x%02llx\n", val);
+	get_reg((void *)BMS_OUTPUT1, &val);
+	pr_info("BMS_OUTPUT1 = 0x%02llx\n", val);
+	get_reg((void *)BMS_TOLERANCES, &val);
+	pr_info("BMS_TOLERANCES = 0x%02llx\n", val);
+	get_reg((void *)BMS_TEST1, &val);
+	pr_info("BMS_TEST1 = 0x%02llx\n", val);
+	get_reg((void *)OCV_UPDATE_STORAGE, &val);
+	pr_info("OCV_UPDATE_STORAGE = 0x%02llx\n", val);
+
+	
+	get_reading((void *)CC_MSB, &val);
+	pr_info("read_cc = 0x%lld\n", val);
+	get_reading((void *)LAST_GOOD_OCV_VALUE, &val);
+	pr_info("last_good_ocv = 0x%lld\n", val);
+	get_reading((void *)VBATT_FOR_RBATT, &val);
+	pr_info("vbatt_for_rbatt = 0x%lld\n", val);
+	get_reading((void *)VSENSE_FOR_RBATT, &val);
+	pr_info("vsense_for_rbatt = 0x%lld\n", val);
+	get_reading((void *)OCV_FOR_RBATT, &val);
+	pr_info("ocv_for_rbatt = 0x%lld\n", val);
+	get_reading((void *)VSENSE_AVG, &val);
+	pr_info("vsense_avg = 0x%lld\n", val);
+
+	
+	pr_info("BMS irq: %d%d%d%d%d%d%d\n",
+		pm_bms_get_rt_status(the_chip, PM8921_BMS_SBI_WRITE_OK),
+		pm_bms_get_rt_status(the_chip, PM8921_BMS_CC_THR),
+		pm_bms_get_rt_status(the_chip, PM8921_BMS_VSENSE_THR),
+		pm_bms_get_rt_status(the_chip, PM8921_BMS_VSENSE_FOR_R),
+		pm_bms_get_rt_status(the_chip, PM8921_BMS_OCV_FOR_R),
+		pm_bms_get_rt_status(the_chip, PM8921_BMS_GOOD_OCV),
+		pm_bms_get_rt_status(the_chip, PM8921_BMS_VSENSE_AVG));
+
+	pm8xxx_ccadc_dump_all();
+}
+
+inline int pm8921_bms_dump_all(void)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	dump_all();
+	return 0;
+}
+EXPORT_SYMBOL(pm8921_bms_dump_all);
+
+int pm8921_bms_get_attr_text(char *buf, int size)
+{
+	struct pm8921_soc_params raw;
+	struct pm8921_rbatt_params rraw;
+	unsigned long flags;
+	int len = 0;
+	u64 val = 0;
+	int cc_uah, fcc_uah, unusable_charge_uah, remaining_charge_uah;
+	int chargecycles;
+	int soc_rbatt, rbatt;
+	int batt_temp, rc;
+	struct pm8xxx_adc_chan_result result;
+
+	if (!the_chip) {
+		pr_err("driver not initialized\n");
+		return 0;
+	}
+
+	get_reg((void *)BMS_CONTROL, &val);
+	len += scnprintf(buf + len, size - len,
+			"BMS_CONTROL: 0x%02llx;\n", val);
+	get_reg((void *)BMS_OUTPUT0, &val);
+	len += scnprintf(buf + len, size - len,
+			"BMS_OUTPUT0: 0x%02llx;\n", val);
+	get_reg((void *)BMS_OUTPUT1, &val);
+	len += scnprintf(buf + len, size - len,
+			"BMS_OUTPUT1: 0x%02llx;\n", val);
+	get_reg((void *)BMS_TOLERANCES, &val);
+	len += scnprintf(buf + len, size - len,
+			"BMS_TOLERANCES: 0x%02llx;\n", val);
+	get_reg((void *)BMS_TEST1, &val);
+	len += scnprintf(buf + len, size - len,
+			"BMS_TEST1: 0x%02llx;\n", val);
+	get_reg((void *)OCV_UPDATE_STORAGE, &val);
+	len += scnprintf(buf + len, size - len,
+			"OCV_UPDATE_STORAGE: 0x%02llx;\n", val);
+
+	len += scnprintf(buf + len, size - len,
+			"bms_discharge_soc: %d;\n", bms_discharge_percent);
+	len += scnprintf(buf + len, size - len,
+			"is_ocv_update_start: %d;\n", is_ocv_update_start);
+
+	read_soc_params_raw(the_chip, &raw);
+	read_rbatt_params_raw(the_chip, &rraw);
+
+	len += scnprintf(buf + len, size - len,
+			"OCV_FOR_RBATT_RAW: 0x%x;\n", rraw.ocv_for_rbatt_raw);
+	len += scnprintf(buf + len, size - len,
+			"VBATT_FOR_RBATT_RAW: 0x%x;\n", rraw.vbatt_for_rbatt_raw);
+	len += scnprintf(buf + len, size - len,
+			"VSENSE_FOR_RBATT_RAW: 0x%x;\n", rraw.vsense_for_rbatt_raw);
+	len += scnprintf(buf + len, size - len,
+			"LAST_GOOD_OCV_RAW: 0x%x;\n", raw.last_good_ocv_raw);
+	len += scnprintf(buf + len, size - len,
+			"CC_RAW: 0x%x;\n", raw.cc);
+
+	len += scnprintf(buf + len, size - len,
+			"ocv_for_rbatt_uv: %d;\n", rraw.ocv_for_rbatt_uv);
+	len += scnprintf(buf + len, size - len,
+			"vbatt_for_rbatt_uv: %d;\n", rraw.vbatt_for_rbatt_uv);
+	len += scnprintf(buf + len, size - len,
+			"vsense_for_rbatt_uv: %d;\n", rraw.vsense_for_rbatt_uv);
+	len += scnprintf(buf + len, size - len,
+			"last_good_ocv_uv: %d;\n", raw.last_good_ocv_uv);
+
+	rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+				the_chip->batt_temp_channel, rc);
+		return len;
+	}
+	batt_temp = (int)result.physical;
+	chargecycles = last_chargecycles;
+	fcc_uah = calculate_fcc_uah(the_chip, batt_temp, chargecycles);
+	remaining_charge_uah = calculate_remaining_charge_uah(the_chip, &raw,
+					fcc_uah, batt_temp, chargecycles);
+	spin_lock_irqsave(&the_chip->bms_100_lock, flags);
+	calculate_cc_uah(the_chip, raw.cc, &cc_uah);
+	spin_unlock_irqrestore(&the_chip->bms_100_lock, flags);
+	soc_rbatt = ((remaining_charge_uah - cc_uah) * 100) / fcc_uah;
+	if (soc_rbatt < 0)
+		soc_rbatt = 0;
+	rbatt = get_rbatt(the_chip, soc_rbatt, batt_temp);
+	unusable_charge_uah = calculate_unusable_charge_uah(the_chip, rbatt,
+					fcc_uah, batt_temp, chargecycles);
+	len += scnprintf(buf + len, size - len,
+			"rbatt(milliOhms): %d;\n", bms_dbg.rbatt);
+	len += scnprintf(buf + len, size - len,
+			"rbatt_scalefactor: %d;\n", bms_dbg.rbatt_sf);
+	len += scnprintf(buf + len, size - len,
+			"soc_rbatt(%%): %d;\n", bms_dbg.soc_rbatt);
+	len += scnprintf(buf + len, size - len,
+			"last_rbatt(%%): %d;\n", last_rbatt);
+	len += scnprintf(buf + len, size - len,
+			"voltage_unusable_uv(uV): %d;\n", bms_dbg.voltage_unusable_uv);
+	len += scnprintf(buf + len, size - len,
+			"pc_unusable(%%): %d;\n", bms_dbg.pc_unusable);
+	len += scnprintf(buf + len, size - len,
+			"rc_pc(%%): %d;\n", bms_dbg.rc_pc);
+	len += scnprintf(buf + len, size - len,
+			"scalefactor(): %d;\n", bms_dbg.scalefactor);
+	len += scnprintf(buf + len, size - len,
+			"fcc(uAh): %d;\n", fcc_uah);
+	len += scnprintf(buf + len, size - len,
+			"unusable_charge(uAh): %d;\n", unusable_charge_uah);
+	len += scnprintf(buf + len, size - len,
+			"remaining_charge(uAh): %d;\n", remaining_charge_uah);
+	len += scnprintf(buf + len, size - len,
+			"cc(uAh): %d;\n", cc_uah);
+	len += scnprintf(buf + len, size - len,
+			"chargecycles: %d;\n", chargecycles);
+	len += scnprintf(buf + len, size - len,
+			"start_percent: %d;\n", the_chip->start_percent);
+	len += scnprintf(buf + len, size - len,
+			"end_percent: %d;\n", the_chip->end_percent);
+
+	
+	len += pm8xxx_ccadc_get_attr_text(buf + len, size - len);
+
+	return len;
+}
+EXPORT_SYMBOL(pm8921_bms_get_attr_text);
+
+static void create_debugfs_entries(struct pm8921_bms_chip *chip)
+{
+	int i;
+
+	chip->dent = debugfs_create_dir("pm8921-bms", NULL);
+
+	if (IS_ERR(chip->dent)) {
+		pr_err("pmic bms couldnt create debugfs dir\n");
+		return;
+	}
+
+	debugfs_create_file("BMS_CONTROL", 0644, chip->dent,
+			(void *)BMS_CONTROL, &reg_fops);
+	debugfs_create_file("BMS_OUTPUT0", 0644, chip->dent,
+			(void *)BMS_OUTPUT0, &reg_fops);
+	debugfs_create_file("BMS_OUTPUT1", 0644, chip->dent,
+			(void *)BMS_OUTPUT1, &reg_fops);
+	debugfs_create_file("BMS_TEST1", 0644, chip->dent,
+			(void *)BMS_TEST1, &reg_fops);
+
+	debugfs_create_file("test_batt_temp", 0644, chip->dent,
+				(void *)TEST_BATT_TEMP, &temp_fops);
+	debugfs_create_file("test_chargecycle", 0644, chip->dent,
+				(void *)TEST_CHARGE_CYCLE, &temp_fops);
+	debugfs_create_file("test_ocv", 0644, chip->dent,
+				(void *)TEST_OCV, &temp_fops);
+
+	debugfs_create_file("read_cc", 0644, chip->dent,
+				(void *)CC_MSB, &reading_fops);
+	debugfs_create_file("read_last_good_ocv", 0644, chip->dent,
+				(void *)LAST_GOOD_OCV_VALUE, &reading_fops);
+	debugfs_create_file("read_vbatt_for_rbatt", 0644, chip->dent,
+				(void *)VBATT_FOR_RBATT, &reading_fops);
+	debugfs_create_file("read_vsense_for_rbatt", 0644, chip->dent,
+				(void *)VSENSE_FOR_RBATT, &reading_fops);
+	debugfs_create_file("read_ocv_for_rbatt", 0644, chip->dent,
+				(void *)OCV_FOR_RBATT, &reading_fops);
+	debugfs_create_file("read_vsense_avg", 0644, chip->dent,
+				(void *)VSENSE_AVG, &reading_fops);
+
+	debugfs_create_file("show_rbatt", 0644, chip->dent,
+				(void *)CALC_RBATT, &calc_fops);
+	debugfs_create_file("show_fcc", 0644, chip->dent,
+				(void *)CALC_FCC, &calc_fops);
+	debugfs_create_file("show_pc", 0644, chip->dent,
+				(void *)CALC_PC, &calc_fops);
+	debugfs_create_file("show_soc", 0644, chip->dent,
+				(void *)CALC_SOC, &calc_fops);
+	debugfs_create_file("calib_hkadc", 0644, chip->dent,
+				(void *)CALIB_HKADC, &calc_fops);
+	debugfs_create_file("calib_ccadc", 0644, chip->dent,
+				(void *)CALIB_CCADC, &calc_fops);
+	debugfs_create_file("stop_ocv", 0644, chip->dent,
+				(void *)STOP_OCV, &calc_fops);
+	debugfs_create_file("start_ocv", 0644, chip->dent,
+				(void *)START_OCV, &calc_fops);
+
+	debugfs_create_file("simultaneous", 0644, chip->dent,
+			(void *)GET_VBAT_VSENSE_SIMULTANEOUS, &calc_fops);
+
+	for (i = 0; i < ARRAY_SIZE(bms_irq_data); i++) {
+		if (chip->pmic_bms_irq[bms_irq_data[i].irq_id])
+			debugfs_create_file(bms_irq_data[i].name, 0444,
+				chip->dent,
+				(void *)bms_irq_data[i].irq_id,
+				&rt_fops);
+	}
+}
+
+static int dump_cc_uah(void)
+{
+	unsigned long flags;
+	struct pm8921_soc_params raw;
+	int cc_uah;
+
+	if (!the_chip) {
+		pr_err("driver not initialized\n");
+		return 0;
+	}
+	read_soc_params_raw(the_chip, &raw);
+
+	spin_lock_irqsave(&the_chip->bms_100_lock, flags);
+	
+	calculate_cc_uah(the_chip, raw.cc, &cc_uah);
+	pr_info("cc_uah = %duAh, raw->cc = %x,"
+			" cc = %lld after subtracting %d\n",
+				cc_uah, raw.cc,
+				(int64_t)raw.cc - the_chip->cc_reading_at_100,
+				the_chip->cc_reading_at_100);
+	spin_unlock_irqrestore(&the_chip->bms_100_lock, flags);
+	return cc_uah;
+}
+
+int prev_cc_uah = 0;
+static int pm8921_bms_suspend(struct device *dev)
+{
+	u64 val;
+	int rc;
+	struct pm8xxx_adc_chan_result result;
+	struct pm8921_bms_chip *chip = dev_get_drvdata(dev);
+	struct pm8921_soc_params raw;
+	int fcc_uah;
+	int remaining_charge_uah;
+	int cc_uah;
+
+	chip->batt_temp_suspend = 0;
+	rc = pm8xxx_adc_read(chip->batt_temp_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					chip->batt_temp_channel, rc);
+	}
+	chip->batt_temp_suspend = (int)result.physical;
+	read_soc_params_raw(chip, &raw);
+
+	fcc_uah = calculate_fcc_uah(chip,
+			chip->batt_temp_suspend, last_chargecycles);
+	pr_debug("FCC = %uuAh batt_temp = %d, cycles = %d\n",
+			fcc_uah, chip->batt_temp_suspend, last_chargecycles);
+	
+	remaining_charge_uah = calculate_remaining_charge_uah(chip, &raw,
+					fcc_uah, chip->batt_temp_suspend,
+					last_chargecycles);
+	pr_debug("RC = %uuAh\n", remaining_charge_uah);
+
+	
+	calculate_cc_uah(chip, raw.cc, &cc_uah);
+	pr_debug("cc_uah = %duAh raw->cc = %x cc = %lld after subtracting %d\n",
+				cc_uah, raw.cc,
+				(int64_t)raw.cc - chip->cc_reading_at_100,
+				chip->cc_reading_at_100);
+	chip->soc_rbatt_suspend = ((remaining_charge_uah - cc_uah) * 100)
+						/ fcc_uah;
+
+	dump_cc_uah();
+	get_reg((void *)BMS_TOLERANCES, &val);
+	pr_info("BMS_TOLERANCES = 0x%02llx\n", val);
+	return 0;
+}
+
+#define DELTA_RBATT_PERCENT	10
+static int pm8921_bms_resume(struct device *dev)
+{
+	u64 val;
+	struct pm8921_rbatt_params raw;
+	struct pm8921_bms_chip *chip = dev_get_drvdata(dev);
+	int rbatt;
+	int expected_rbatt;
+	int scalefactor;
+	int delta_rbatt;
+
+	read_rbatt_params_raw(chip, &raw);
+	rbatt = calculate_rbatt_resume(chip, &raw);
+
+	if (rbatt < 0)
+		return 0;
+
+	expected_rbatt
+		= (last_rbatt < 0) ? chip->default_rbatt_mohm : last_rbatt;
+
+	if (chip->rbatt_sf_lut) {
+		scalefactor = interpolate_scalingfactor(chip,
+						chip->rbatt_sf_lut,
+						chip->batt_temp_suspend / 10,
+						chip->soc_rbatt_suspend);
+		rbatt = rbatt * 100 / scalefactor;
+	}
+
+	delta_rbatt = expected_rbatt - rbatt;
+	if (delta_rbatt)
+		delta_rbatt = -delta_rbatt;
+	if (delta_rbatt * 100 <= DELTA_RBATT_PERCENT * expected_rbatt)
+		last_rbatt = rbatt;
+
+	dump_cc_uah();
+	get_reg((void *)BMS_TOLERANCES, &val);
+	pr_info("last_rbatt:%d , BMS_TOLERANCES = 0x%02llx\n", last_rbatt, val);
+	return 0;
+}
+
+static const struct dev_pm_ops pm8921_bms_pm_ops = {
+	.suspend	= pm8921_bms_suspend,
+	.resume		= pm8921_bms_resume,
+};
+
+#define REG_SBI_CONFIG		0x04F
+#define PAGE3_ENABLE_MASK	0x6
+#define PROGRAM_REV_MASK	0x0F
+#define PROGRAM_REV		0x9
+static int read_ocv_trim(struct pm8921_bms_chip *chip)
+{
+	int rc;
+	u8 reg, sbi_config;
+
+	rc = pm8xxx_readb(chip->dev->parent, REG_SBI_CONFIG, &sbi_config);
+	if (rc) {
+		pr_err("error = %d reading sbi config reg\n", rc);
+		return rc;
+	}
+
+	reg = sbi_config | PAGE3_ENABLE_MASK;
+	rc = pm8xxx_writeb(chip->dev->parent, REG_SBI_CONFIG, reg);
+	if (rc) {
+		pr_err("error = %d writing sbi config reg\n", rc);
+		return rc;
+	}
+
+	rc = pm8xxx_readb(chip->dev->parent, TEST_PROGRAM_REV, &reg);
+	if (rc)
+		pr_err("Error %d reading %d addr %d\n",
+			rc, reg, TEST_PROGRAM_REV);
+	pr_info("program rev reg is 0x%x\n", reg);
+	reg &= PROGRAM_REV_MASK;
+
+	
+	if (reg >= PROGRAM_REV) {
+		chip->amux_2_trim_delta = 0;
+		goto restore_sbi_config;
+	}
+
+	rc = pm8xxx_readb(chip->dev->parent, AMUX_TRIM_2, &reg);
+	if (rc) {
+		pr_err("error = %d reading trim reg\n", rc);
+		return rc;
+	}
+
+	chip->amux_2_trim_delta = abs(0x49 - reg);
+	pr_info("trim reg=0x%x, trim delta=%d\n", reg, chip->amux_2_trim_delta);
+
+restore_sbi_config:
+	rc = pm8xxx_writeb(chip->dev->parent, REG_SBI_CONFIG, sbi_config);
+	if (rc) {
+		pr_err("error = %d writing sbi config reg\n", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+static int __devinit pm8921_bms_probe(struct platform_device *pdev)
+{
+	int rc = 0;
+	int vbatt;
+	struct pm8921_bms_chip *chip;
+	const struct pm8921_bms_platform_data *pdata
+				= pdev->dev.platform_data;
+#ifdef CONFIG_HTC_BATT_8960
+	const struct pm8921_charger_batt_param *chg_batt_param;
+#endif
+
+	pr_info("%s\n", __func__);
+
+	if (!pdata) {
+		pr_err("missing platform data\n");
+		return -EINVAL;
+	}
+
+	chip = kzalloc(sizeof(struct pm8921_bms_chip), GFP_KERNEL);
+	if (!chip) {
+		pr_err("Cannot allocate pm_bms_chip\n");
+		return -ENOMEM;
+	}
+	mutex_init(&chip->bms_output_lock);
+	spin_lock_init(&chip->bms_100_lock);
+	chip->dev = &pdev->dev;
+	chip->r_sense = pdata->r_sense;
+	chip->i_test = pdata->i_test;
+	chip->v_failure = pdata->v_failure;
+	chip->rconn_mohm = pdata->rconn_mohm;
+	chip->start_percent = -EINVAL;
+	chip->end_percent = -EINVAL;
+
+	chip->batt_temp_channel = pdata->bms_cdata.batt_temp_channel;
+	chip->vbat_channel = pdata->bms_cdata.vbat_channel;
+	chip->ref625mv_channel = pdata->bms_cdata.ref625mv_channel;
+	chip->ref1p25v_channel = pdata->bms_cdata.ref1p25v_channel;
+	chip->batt_id_channel = pdata->bms_cdata.batt_id_channel;
+	chip->revision = pm8xxx_get_revision(chip->dev->parent);
+	INIT_WORK(&chip->calib_hkadc_work, calibrate_hkadc_work);
+
+	rc = set_battery_data(chip);
+	if (rc) {
+		pr_err("%s bad battery data %d\n", __func__, rc);
+		goto free_chip;
+	}
+#ifdef CONFIG_HTC_BATT_8960
+	
+	chg_batt_param = htc_battery_cell_get_cur_cell_charger_cdata();
+	if (!chg_batt_param) {
+		chip->max_voltage_uv = pdata->max_voltage_uv;
+	} else {
+		chip->max_voltage_uv = chg_batt_param->max_voltage * 1000;
+	}
+#else
+	chip->max_voltage_uv = pdata->max_voltage_uv;
+#endif 
+
+	if (chip->pc_temp_ocv_lut == NULL) {
+		pr_err("temp ocv lut table is NULL\n");
+		rc = -EINVAL;
+		goto free_chip;
+	}
+
+	
+	if (chip->default_rbatt_mohm <= 0)
+		chip->default_rbatt_mohm = DEFAULT_RBATT_MOHMS;
+
+
+	rc = request_irqs(chip, pdev);
+	if (rc) {
+		pr_err("couldn't register interrupts rc = %d\n", rc);
+		goto free_chip;
+	}
+
+	rc = pm8921_bms_hw_init(chip);
+	if (rc) {
+		pr_err("couldn't init hardware rc = %d\n", rc);
+		goto free_irqs;
+	}
+
+	platform_set_drvdata(pdev, chip);
+	the_chip = chip;
+	create_debugfs_entries(chip);
+
+	rc = read_ocv_trim(chip);
+	if (rc) {
+		pr_err("couldn't adjust ocv_trim rc= %d\n", rc);
+		goto free_irqs;
+	}
+	check_initial_ocv(chip);
+
+	
+	schedule_work(&chip->calib_hkadc_work);
+	
+	pm8921_bms_enable_irq(chip, PM8921_BMS_GOOD_OCV);
+	pm8921_bms_enable_irq(chip, PM8921_BMS_OCV_FOR_R);
+
+	get_battery_uvolts(chip, &vbatt);
+	pr_info("OK battery_capacity_at_boot=%d volt = %d ocv = %d\n",
+				pm8921_bms_get_percent_charge(),
+				vbatt, last_ocv_uv);
+	pr_info("r_sense=%u,i_test=%u,v_failure=%u\n", chip->r_sense, chip->i_test, chip->v_failure);
+	return 0;
+
+free_irqs:
+	free_irqs(chip);
+free_chip:
+	kfree(chip);
+	return rc;
+}
+
+static int __devexit pm8921_bms_remove(struct platform_device *pdev)
+{
+	struct pm8921_bms_chip *chip = platform_get_drvdata(pdev);
+
+	free_irqs(chip);
+	kfree(chip->adjusted_fcc_temp_lut);
+	platform_set_drvdata(pdev, NULL);
+	the_chip = NULL;
+	kfree(chip);
+	return 0;
+}
+
+static struct platform_driver pm8921_bms_driver = {
+	.probe	= pm8921_bms_probe,
+	.remove	= __devexit_p(pm8921_bms_remove),
+	.driver	= {
+		.name	= PM8921_BMS_DEV_NAME,
+		.owner	= THIS_MODULE,
+		.pm = &pm8921_bms_pm_ops,
+	},
+};
+
+static int __init pm8921_bms_init(void)
+{
+	flag_enable_bms_chg_log =
+		(get_kernel_flag() & KERNEL_FLAG_ENABLE_BMS_CHARGER_LOG) ? 1 : 0;
+	return platform_driver_register(&pm8921_bms_driver);
+}
+
+static void __exit pm8921_bms_exit(void)
+{
+	platform_driver_unregister(&pm8921_bms_driver);
+}
+
+late_initcall(pm8921_bms_init);
+module_exit(pm8921_bms_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("PMIC8921 bms driver");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("platform:" PM8921_BMS_DEV_NAME);
diff --git a/drivers/power/pm8921-charger-htc.c b/drivers/power/pm8921-charger-htc.c
new file mode 100644
index 0000000..aebb958
--- /dev/null
+++ b/drivers/power/pm8921-charger-htc.c
@@ -0,0 +1,5323 @@
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ *
+ */
+#define pr_fmt(fmt)	"[BATT][CHG] " fmt
+#define pr_fmt_debug(fmt)    "[BATT][CHG]%s: " fmt, __func__
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+#include <linux/errno.h>
+#include <linux/mfd/pm8xxx/pm8921-charger-htc.h>
+#include <linux/mfd/pm8xxx/pm8921-bms-htc.h>
+#include <linux/mfd/pm8xxx/pm8xxx-adc.h>
+#include <linux/mfd/pm8xxx/ccadc.h>
+#include <linux/mfd/pm8xxx/core.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/bitops.h>
+#include <linux/workqueue.h>
+#include <linux/debugfs.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+
+#include <mach/msm_xo.h>
+#ifdef CONFIG_USB_MSM_OTG_72K
+#include <mach/msm_hsusb.h>
+#else
+#include <linux/usb/msm_hsusb.h>
+#endif
+#include <mach/board_htc.h>
+
+#include <mach/htc_gauge.h>
+#include <mach/htc_charger.h>
+#include <mach/htc_battery_cell.h>
+
+#include <mach/cable_detect.h>
+#include <linux/i2c/smb349.h>
+
+static int extchg_temp_condition_old;
+
+struct delayed_work ext_charger_vbat_low_task;
+struct delayed_work ext_charger_chgdone_task;
+struct delayed_work ext_charger_temp_task;
+struct workqueue_struct *ext_charger_wq;
+
+#if defined(pr_debug)
+#undef pr_debug
+#endif
+#define pr_debug(fmt, ...) do { \
+		if (flag_enable_BMS_Charger_log) \
+			printk(KERN_INFO pr_fmt_debug(fmt), ##__VA_ARGS__); \
+	} while (0)
+
+static bool flag_enable_BMS_Charger_log;
+
+#define CHG_BUCK_CLOCK_CTRL	0x14
+
+#define PBL_ACCESS1		0x04
+#define PBL_ACCESS2		0x05
+#define SYS_CONFIG_1		0x06
+#define SYS_CONFIG_2		0x07
+#define CHG_CNTRL		0x204
+#define CHG_IBAT_MAX		0x205
+#define CHG_TEST		0x206
+#define CHG_BUCK_CTRL_TEST1	0x207
+#define CHG_BUCK_CTRL_TEST2	0x208
+#define CHG_BUCK_CTRL_TEST3	0x209
+#define COMPARATOR_OVERRIDE	0x20A
+#define PSI_TXRX_SAMPLE_DATA_0	0x20B
+#define PSI_TXRX_SAMPLE_DATA_1	0x20C
+#define PSI_TXRX_SAMPLE_DATA_2	0x20D
+#define PSI_TXRX_SAMPLE_DATA_3	0x20E
+#define PSI_CONFIG_STATUS	0x20F
+#define CHG_IBAT_SAFE		0x210
+#define CHG_ITRICKLE		0x211
+#define CHG_CNTRL_2		0x212
+#define CHG_VBAT_DET		0x213
+#define CHG_VTRICKLE		0x214
+#define CHG_ITERM		0x215
+#define CHG_CNTRL_3		0x216
+#define CHG_VIN_MIN		0x217
+#define CHG_TWDOG		0x218
+#define CHG_TTRKL_MAX		0x219
+#define CHG_TEMP_THRESH		0x21A
+#define CHG_TCHG_MAX		0x21B
+#define USB_OVP_CONTROL		0x21C
+#define DC_OVP_CONTROL		0x21D
+#define USB_OVP_TEST		0x21E
+#define DC_OVP_TEST		0x21F
+#define CHG_VDD_MAX		0x220
+#define CHG_VDD_SAFE		0x221
+#define CHG_VBAT_BOOT_THRESH	0x222
+#define USB_OVP_TRIM		0x355
+#define BUCK_CONTROL_TRIM1	0x356
+#define BUCK_CONTROL_TRIM2	0x357
+#define BUCK_CONTROL_TRIM3	0x358
+#define BUCK_CONTROL_TRIM4	0x359
+#define CHG_DEFAULTS_TRIM	0x35A
+#define CHG_ITRIM		0x35B
+#define CHG_TTRIM		0x35C
+#define CHG_COMP_OVR		0x20A
+
+#define EOC_CHECK_PERIOD_MS	10000
+#define UNPLUG_CHECK_WAIT_PERIOD_MS 200
+
+#define USB_MA_2	(2)
+#define USB_MA_500	(500)
+#define USB_MA_900	(900)
+#define USB_MA_1100	(1100)
+
+#define SAFETY_TIME_MAX_LIMIT		510
+#define SAFETY_TIME_8HR_TWICE		480
+
+enum chg_fsm_state {
+	FSM_STATE_OFF_0 = 0,
+	FSM_STATE_BATFETDET_START_12 = 12,
+	FSM_STATE_BATFETDET_END_16 = 16,
+	FSM_STATE_ON_CHG_HIGHI_1 = 1,
+	FSM_STATE_ATC_2A = 2,
+	FSM_STATE_ATC_2B = 18,
+	FSM_STATE_ON_BAT_3 = 3,
+	FSM_STATE_ATC_FAIL_4 = 4 ,
+	FSM_STATE_DELAY_5 = 5,
+	FSM_STATE_ON_CHG_AND_BAT_6 = 6,
+	FSM_STATE_FAST_CHG_7 = 7,
+	FSM_STATE_TRKL_CHG_8 = 8,
+	FSM_STATE_CHG_FAIL_9 = 9,
+	FSM_STATE_EOC_10 = 10,
+	FSM_STATE_ON_CHG_VREGOK_11 = 11,
+	FSM_STATE_ATC_PAUSE_13 = 13,
+	FSM_STATE_FAST_CHG_PAUSE_14 = 14,
+	FSM_STATE_TRKL_CHG_PAUSE_15 = 15,
+	FSM_STATE_START_BOOT = 20,
+	FSM_STATE_FLCB_VREGOK = 21,
+	FSM_STATE_FLCB = 22,
+};
+
+struct fsm_state_to_batt_status {
+	enum chg_fsm_state	fsm_state;
+	int			batt_state;
+};
+
+static struct fsm_state_to_batt_status map[] = {
+	{FSM_STATE_OFF_0, POWER_SUPPLY_STATUS_UNKNOWN},
+	{FSM_STATE_BATFETDET_START_12, POWER_SUPPLY_STATUS_UNKNOWN},
+	{FSM_STATE_BATFETDET_END_16, POWER_SUPPLY_STATUS_UNKNOWN},
+	{FSM_STATE_ON_CHG_HIGHI_1, POWER_SUPPLY_STATUS_FULL},
+	{FSM_STATE_ATC_2A, POWER_SUPPLY_STATUS_CHARGING},
+	{FSM_STATE_ATC_2B, POWER_SUPPLY_STATUS_CHARGING},
+	{FSM_STATE_ON_BAT_3, POWER_SUPPLY_STATUS_DISCHARGING},
+	{FSM_STATE_ATC_FAIL_4, POWER_SUPPLY_STATUS_DISCHARGING},
+	{FSM_STATE_DELAY_5, POWER_SUPPLY_STATUS_UNKNOWN },
+	{FSM_STATE_ON_CHG_AND_BAT_6, POWER_SUPPLY_STATUS_CHARGING},
+	{FSM_STATE_FAST_CHG_7, POWER_SUPPLY_STATUS_CHARGING},
+	{FSM_STATE_TRKL_CHG_8, POWER_SUPPLY_STATUS_CHARGING},
+	{FSM_STATE_CHG_FAIL_9, POWER_SUPPLY_STATUS_DISCHARGING},
+	{FSM_STATE_EOC_10, POWER_SUPPLY_STATUS_FULL},
+	{FSM_STATE_ON_CHG_VREGOK_11, POWER_SUPPLY_STATUS_NOT_CHARGING},
+	{FSM_STATE_ATC_PAUSE_13, POWER_SUPPLY_STATUS_NOT_CHARGING},
+	{FSM_STATE_FAST_CHG_PAUSE_14, POWER_SUPPLY_STATUS_NOT_CHARGING},
+	{FSM_STATE_TRKL_CHG_PAUSE_15, POWER_SUPPLY_STATUS_NOT_CHARGING},
+	{FSM_STATE_START_BOOT, POWER_SUPPLY_STATUS_NOT_CHARGING},
+	{FSM_STATE_FLCB_VREGOK, POWER_SUPPLY_STATUS_NOT_CHARGING},
+	{FSM_STATE_FLCB, POWER_SUPPLY_STATUS_NOT_CHARGING},
+};
+
+enum chg_regulation_loop {
+	VDD_LOOP = BIT(3),
+	BAT_CURRENT_LOOP = BIT(2),
+	INPUT_CURRENT_LOOP = BIT(1),
+	INPUT_VOLTAGE_LOOP = BIT(0),
+	CHG_ALL_LOOPS = VDD_LOOP | BAT_CURRENT_LOOP
+			| INPUT_CURRENT_LOOP | INPUT_VOLTAGE_LOOP,
+};
+
+enum pmic_chg_interrupts {
+	USBIN_VALID_IRQ = 0,
+	USBIN_OV_IRQ,
+	BATT_INSERTED_IRQ,
+	VBATDET_LOW_IRQ,
+	USBIN_UV_IRQ,
+	VBAT_OV_IRQ,
+	CHGWDOG_IRQ,
+	VCP_IRQ,
+	ATCDONE_IRQ,
+	ATCFAIL_IRQ,
+	CHGDONE_IRQ,
+	CHGFAIL_IRQ,
+	CHGSTATE_IRQ,
+	LOOP_CHANGE_IRQ,
+	FASTCHG_IRQ,
+	TRKLCHG_IRQ,
+	BATT_REMOVED_IRQ,
+	BATTTEMP_HOT_IRQ,
+	CHGHOT_IRQ,
+	BATTTEMP_COLD_IRQ,
+	CHG_GONE_IRQ,
+	BAT_TEMP_OK_IRQ,
+	COARSE_DET_LOW_IRQ,
+	VDD_LOOP_IRQ,
+	VREG_OV_IRQ,
+	VBATDET_IRQ,
+	BATFET_IRQ,
+	PSI_IRQ,
+	DCIN_VALID_IRQ,
+	DCIN_OV_IRQ,
+	DCIN_UV_IRQ,
+	PM_CHG_MAX_INTS,
+};
+
+struct bms_notify {
+	int			is_battery_full;
+	int			is_charging;
+	struct	work_struct	work;
+};
+
+struct pm8921_chg_chip {
+	struct device			*dev;
+	unsigned int			usb_present;
+	unsigned int			dc_present;
+	unsigned int			usb_charger_current;
+	unsigned int			max_bat_chg_current;
+	unsigned int			pmic_chg_irq[PM_CHG_MAX_INTS];
+	unsigned int			safety_time;
+	unsigned int			ttrkl_time;
+	unsigned int			update_time;
+	unsigned int			max_voltage_mv;
+	unsigned int			min_voltage_mv;
+	int						cool_temp_dc;
+	int						warm_temp_dc;
+	unsigned int			temp_check_period;
+	unsigned int			cool_bat_chg_current;
+	unsigned int			warm_bat_chg_current;
+	unsigned int			cool_bat_voltage;
+	unsigned int			warm_bat_voltage;
+	unsigned int			is_bat_cool;
+	unsigned int			is_bat_warm;
+	unsigned int			resume_voltage_delta;
+	unsigned int			term_current;
+	unsigned int			vbat_channel;
+	unsigned int			batt_temp_channel;
+	unsigned int			batt_id_channel;
+	struct dentry			*dent;
+	struct bms_notify		bms_notify;
+	struct ext_chg_pm8921		*ext;		
+	struct ext_usb_chg_pm8921	*ext_usb;	
+	bool				keep_btm_on_suspend;
+	bool				ext_charging;
+	bool				ext_charge_done;
+	bool				ext_usb_charging;	
+	bool				ext_usb_charge_done;	
+	bool				dc_unplug_check;
+	DECLARE_BITMAP(enabled_irqs, PM_CHG_MAX_INTS);
+	struct work_struct		battery_id_valid_work;
+	int64_t				batt_id_min;
+	int64_t				batt_id_max;
+	int				trkl_voltage;
+	int				weak_voltage;
+	int				trkl_current;
+	int				weak_current;
+	int				vin_min;
+	unsigned int			*thermal_mitigation;
+	int				thermal_levels;
+	int				mbat_in_gpio;
+	int				is_embeded_batt;
+	struct delayed_work		update_heartbeat_work;
+	struct delayed_work		eoc_work;
+	struct delayed_work		recharge_check_work;
+	struct work_struct		unplug_ovp_fet_open_work;
+	struct delayed_work		unplug_check_work;
+	struct delayed_work		vin_collapse_check_work;
+	struct wake_lock		unplug_ovp_fet_open_wake_lock;
+	struct wake_lock		eoc_wake_lock;
+	struct wake_lock		recharge_check_wake_lock;
+	enum pm8921_chg_cold_thr	cold_thr;
+	enum pm8921_chg_hot_thr		hot_thr;
+	u8				active_path;
+};
+
+static bool test_power_monitor = 0;
+static bool flag_keep_charge_on;
+static bool flag_pa_recharge;
+static bool flag_disable_wakelock;
+static bool is_batt_full = false;
+static bool is_ac_safety_timeout = false;
+static bool is_ac_safety_timeout_twice = false; 
+static bool is_cable_remove = false;
+
+static int usbin_ov_irq_state = 0;
+static int usbin_uv_irq_state = 0;
+static int ovp = 0;
+static int uvp = 0;
+
+enum htc_power_source_type pwr_src;
+static unsigned int chg_limit_current; 
+static unsigned int usb_max_current;
+static int usb_target_ma;
+static int charging_disabled; 
+static int auto_enable;
+static int thermal_mitigation;
+static int usb_ovp_disable;
+static int bat_temp_ok_prev = -1;
+static int eoc_count; 
+
+static struct pm8921_chg_chip *the_chip;
+
+static struct pm8xxx_adc_arb_btm_param btm_config;
+
+static int get_reg(void *data, u64 *val);
+static int get_reg_loop(void *data, u64 * val);
+static void dump_reg(void);
+static void dump_all(int more);
+static void update_ovp_uvp_state(int ov, int v, int uv);
+static irqreturn_t usbin_ov_irq_handler(int irq, void *data);
+
+static int pm_chg_masked_write(struct pm8921_chg_chip *chip, u16 addr,
+							u8 mask, u8 val)
+{
+	int rc;
+	u8 reg;
+
+	rc = pm8xxx_readb(chip->dev->parent, addr, &reg);
+	if (rc) {
+		pr_err("pm8xxx_readb failed: addr=%03X, rc=%d\n", addr, rc);
+		return rc;
+	}
+	reg &= ~mask;
+	reg |= val & mask;
+	rc = pm8xxx_writeb(chip->dev->parent, addr, reg);
+	if (rc) {
+		pr_err("pm8xxx_writeb failed: addr=%03X, rc=%d\n", addr, rc);
+		return rc;
+	}
+	return 0;
+}
+
+static int pm_chg_get_rt_status(struct pm8921_chg_chip *chip, int irq_id)
+{
+	return pm8xxx_read_irq_stat(chip->dev->parent,
+					chip->pmic_chg_irq[irq_id]);
+}
+
+static int is_usb_chg_plugged_in(struct pm8921_chg_chip *chip)
+{
+	return pm_chg_get_rt_status(chip, USBIN_VALID_IRQ);
+}
+
+static int is_dc_chg_plugged_in(struct pm8921_chg_chip *chip)
+{
+	return pm_chg_get_rt_status(chip, DCIN_VALID_IRQ);
+}
+
+#define CAPTURE_FSM_STATE_CMD	0xC2
+#define READ_BANK_7		0x70
+#define READ_BANK_4		0x40
+static int pm_chg_get_fsm_state(struct pm8921_chg_chip *chip)
+{
+	u8 temp;
+	int err, ret = 0;
+
+	temp = CAPTURE_FSM_STATE_CMD;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return err;
+	}
+
+	temp = READ_BANK_7;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return err;
+	}
+
+	err = pm8xxx_readb(chip->dev->parent, CHG_TEST, &temp);
+	if (err) {
+		pr_err("pm8xxx_readb fail: addr=%03X, rc=%d\n", CHG_TEST, err);
+		return err;
+	}
+	
+	ret = temp & 0xF;
+
+	temp = READ_BANK_4;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return err;
+	}
+
+	err = pm8xxx_readb(chip->dev->parent, CHG_TEST, &temp);
+	if (err) {
+		pr_err("pm8xxx_readb fail: addr=%03X, rc=%d\n", CHG_TEST, err);
+		return err;
+	}
+	
+	ret |= (temp & 0x1) << 4;
+	return  ret;
+}
+
+#define READ_BANK_6		0x60
+static int pm_chg_get_regulation_loop(struct pm8921_chg_chip *chip)
+{
+	u8 temp;
+	int err;
+
+	temp = READ_BANK_6;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return err;
+	}
+
+	err = pm8xxx_readb(chip->dev->parent, CHG_TEST, &temp);
+	if (err) {
+		pr_err("pm8xxx_readb fail: addr=%03X, rc=%d\n", CHG_TEST, err);
+		return err;
+	}
+
+	
+	return temp & CHG_ALL_LOOPS;
+}
+
+#define CHG_USB_SUSPEND_BIT  BIT(2)
+static int pm_chg_usb_suspend_enable(struct pm8921_chg_chip *chip, int enable)
+{
+	return pm_chg_masked_write(chip, CHG_CNTRL_3, CHG_USB_SUSPEND_BIT,
+			enable ? CHG_USB_SUSPEND_BIT : 0);
+}
+
+#define CHG_EN_BIT	BIT(7)
+static int pm_chg_auto_enable(struct pm8921_chg_chip *chip, int enable)
+{
+	return pm_chg_masked_write(chip, CHG_CNTRL_3, CHG_EN_BIT,
+				enable ? CHG_EN_BIT : 0);
+}
+
+#define CHG_FAILED_CLEAR	BIT(0)
+#define ATC_FAILED_CLEAR	BIT(1)
+static int pm_chg_failed_clear(struct pm8921_chg_chip *chip, int clear)
+{
+	int rc;
+
+	rc = pm_chg_masked_write(chip, CHG_CNTRL_3, ATC_FAILED_CLEAR,
+				clear ? ATC_FAILED_CLEAR : 0);
+	rc |= pm_chg_masked_write(chip, CHG_CNTRL_3, CHG_FAILED_CLEAR,
+				clear ? CHG_FAILED_CLEAR : 0);
+	return rc;
+}
+
+#define CHG_CHARGE_DIS_BIT	BIT(1)
+static int pm_chg_charge_dis(struct pm8921_chg_chip *chip, int disable)
+{
+	return pm_chg_masked_write(chip, CHG_CNTRL, CHG_CHARGE_DIS_BIT,
+				disable ? CHG_CHARGE_DIS_BIT : 0);
+}
+
+static DEFINE_SPINLOCK(pwrsrc_lock);
+#define PWRSRC_DISABLED_BIT_KDRV	(1)
+#define PWRSRC_DISABLED_BIT_USER	(1<<1)
+static int pwrsrc_disabled; 
+static int pm_chg_disable_pwrsrc(struct pm8921_chg_chip *chip,
+		int disable, int reason)
+{
+	int rc;
+	unsigned long flags;
+
+	spin_lock_irqsave(&pwrsrc_lock, flags);
+	if (disable)
+		pwrsrc_disabled |= reason;	
+	else
+		pwrsrc_disabled &= ~reason;	
+	rc = pm_chg_charge_dis(chip, pwrsrc_disabled);
+	if (rc)
+		pr_err("Failed rc=%d\n", rc);
+	spin_unlock_irqrestore(&pwrsrc_lock, flags);
+
+	return rc;
+}
+
+static DEFINE_SPINLOCK(charger_lock);
+static int batt_charging_disabled; 
+#define BATT_CHG_DISABLED_BIT_EOC	(1)
+#define BATT_CHG_DISABLED_BIT_KDRV	(1<<1)
+#define BATT_CHG_DISABLED_BIT_USR1	(1<<2)
+#define BATT_CHG_DISABLED_BIT_USR2	(1<<3)
+#define BATT_CHG_DISABLED_BIT_BAT	(1<<4)
+static int pm_chg_disable_auto_enable(struct pm8921_chg_chip *chip,
+		int disable, int reason)
+{
+	int rc;
+	unsigned long flags;
+
+	spin_lock_irqsave(&charger_lock, flags);
+	if (disable)
+		batt_charging_disabled |= reason;	
+	else
+		batt_charging_disabled &= ~reason;	
+	rc = pm_chg_auto_enable(the_chip, !batt_charging_disabled);
+	if (rc)
+		pr_err("Failed rc=%d\n", rc);
+	spin_unlock_irqrestore(&charger_lock, flags);
+
+	return rc;
+}
+
+#define PM8921_CHG_V_MIN_MV	3240
+#define PM8921_CHG_V_STEP_MV	20
+#define PM8921_CHG_V_STEP_10MV_OFFSET_BIT	BIT(7)
+#define PM8921_CHG_VDDMAX_MAX	4500
+#define PM8921_CHG_VDDMAX_MIN	3400
+#define PM8921_CHG_V_MASK	0x7F
+static int __pm_chg_vddmax_set(struct pm8921_chg_chip *chip, int voltage)
+{
+	int remainder;
+	u8 temp = 0;
+
+	if (voltage < PM8921_CHG_VDDMAX_MIN
+			|| voltage > PM8921_CHG_VDDMAX_MAX) {
+		pr_err("bad mV=%d asked to set\n", voltage);
+		return -EINVAL;
+	}
+
+	temp = (voltage - PM8921_CHG_V_MIN_MV) / PM8921_CHG_V_STEP_MV;
+
+	remainder = voltage % 20;
+	if (remainder >= 10) {
+		temp |= PM8921_CHG_V_STEP_10MV_OFFSET_BIT;
+	}
+
+	pr_debug("voltage=%d setting %02x\n", voltage, temp);
+	return pm8xxx_writeb(chip->dev->parent, CHG_VDD_MAX, temp);
+}
+
+static int pm_chg_vddmax_get(struct pm8921_chg_chip *chip, int *voltage)
+{
+	u8 temp;
+	int rc;
+
+	rc = pm8xxx_readb(chip->dev->parent, CHG_VDD_MAX, &temp);
+	if (rc) {
+		pr_err("rc = %d while reading vdd max\n", rc);
+		*voltage = 0;
+		return rc;
+	}
+	*voltage = (int)(temp & PM8921_CHG_V_MASK) * PM8921_CHG_V_STEP_MV
+							+ PM8921_CHG_V_MIN_MV;
+	if (temp & PM8921_CHG_V_STEP_10MV_OFFSET_BIT)
+		*voltage =  *voltage + 10;
+	return 0;
+}
+
+static int pm_chg_vddmax_set(struct pm8921_chg_chip *chip, int voltage)
+{
+	int current_mv, ret, steps, i;
+	bool increase;
+
+	ret = 0;
+
+	if (voltage < PM8921_CHG_VDDMAX_MIN
+		|| voltage > PM8921_CHG_VDDMAX_MAX) {
+		pr_err("bad mV=%d asked to set\n", voltage);
+		return -EINVAL;
+	}
+
+	ret = pm_chg_vddmax_get(chip, &current_mv);
+	if (ret) {
+		pr_err("Failed to read vddmax rc=%d\n", ret);
+		return -EINVAL;
+	}
+	if (current_mv == voltage)
+		return 0;
+
+	
+	if (is_usb_chg_plugged_in(chip)) {
+		if (current_mv < voltage) {
+			steps = (voltage - current_mv) / PM8921_CHG_V_STEP_MV;
+			increase = true;
+		} else {
+			steps = (current_mv - voltage) / PM8921_CHG_V_STEP_MV;
+			increase = false;
+		}
+		for (i = 0; i < steps; i++) {
+			if (increase)
+				current_mv += PM8921_CHG_V_STEP_MV;
+			else
+				current_mv -= PM8921_CHG_V_STEP_MV;
+			ret |= __pm_chg_vddmax_set(chip, current_mv);
+		}
+	}
+	ret |= __pm_chg_vddmax_set(chip, voltage);
+	return ret;
+}
+
+#define PM8921_CHG_VDDSAFE_MIN	3400
+#define PM8921_CHG_VDDSAFE_MAX	4500
+static int pm_chg_vddsafe_set(struct pm8921_chg_chip *chip, int voltage)
+{
+	u8 temp;
+
+	if (voltage < PM8921_CHG_VDDSAFE_MIN
+			|| voltage > PM8921_CHG_VDDSAFE_MAX) {
+		pr_err("bad mV=%d asked to set\n", voltage);
+		return -EINVAL;
+	}
+	temp = (voltage - PM8921_CHG_V_MIN_MV) / PM8921_CHG_V_STEP_MV;
+	pr_debug("voltage=%d setting %02x\n", voltage, temp);
+	return pm_chg_masked_write(chip, CHG_VDD_SAFE, PM8921_CHG_V_MASK, temp);
+}
+
+#define PM8921_CHG_VBATDET_MIN	3240
+#define PM8921_CHG_VBATDET_MAX	5780
+static int pm_chg_vbatdet_set(struct pm8921_chg_chip *chip, int voltage)
+{
+	u8 temp;
+
+	if (voltage < PM8921_CHG_VBATDET_MIN
+			|| voltage > PM8921_CHG_VBATDET_MAX) {
+		pr_err("bad mV=%d asked to set\n", voltage);
+		return -EINVAL;
+	}
+	temp = (voltage - PM8921_CHG_V_MIN_MV) / PM8921_CHG_V_STEP_MV;
+	pr_debug("voltage=%d setting %02x\n", voltage, temp);
+	return pm_chg_masked_write(chip, CHG_VBAT_DET, PM8921_CHG_V_MASK, temp);
+}
+
+#define PM8921_CHG_VINMIN_MIN_MV	3800
+#define PM8921_CHG_VINMIN_STEP_MV	100
+#define PM8921_CHG_VINMIN_USABLE_MAX	6500
+#define PM8921_CHG_VINMIN_USABLE_MIN	4300
+#define PM8921_CHG_VINMIN_MASK		0x1F
+static int pm_chg_vinmin_set(struct pm8921_chg_chip *chip, int voltage)
+{
+	u8 temp;
+
+	if (voltage < PM8921_CHG_VINMIN_USABLE_MIN
+			|| voltage > PM8921_CHG_VINMIN_USABLE_MAX) {
+		pr_err("bad mV=%d asked to set\n", voltage);
+		return -EINVAL;
+	}
+	temp = (voltage - PM8921_CHG_VINMIN_MIN_MV) / PM8921_CHG_VINMIN_STEP_MV;
+	pr_debug("voltage=%d setting %02x\n", voltage, temp);
+	return pm_chg_masked_write(chip, CHG_VIN_MIN, PM8921_CHG_VINMIN_MASK,
+									temp);
+}
+
+static int pm_chg_vinmin_get(struct pm8921_chg_chip *chip)
+{
+	u8 temp;
+	int rc, voltage_mv;
+
+	rc = pm8xxx_readb(chip->dev->parent, CHG_VIN_MIN, &temp);
+	temp &= PM8921_CHG_VINMIN_MASK;
+
+	voltage_mv = PM8921_CHG_VINMIN_MIN_MV +
+			(int)temp * PM8921_CHG_VINMIN_STEP_MV;
+
+	return voltage_mv;
+}
+
+#define PM8921_CHG_IBATMAX_MIN	325
+#define PM8921_CHG_IBATMAX_MAX	2000
+#define PM8921_CHG_I_MIN_MA	225
+#define PM8921_CHG_I_STEP_MA	50
+#define PM8921_CHG_I_MASK	0x3F
+static int pm_chg_ibatmax_set(struct pm8921_chg_chip *chip, int chg_current)
+{
+	u8 temp;
+
+	if (chg_current < PM8921_CHG_I_MIN_MA
+			|| chg_current > PM8921_CHG_IBATMAX_MAX) {
+		pr_err("bad mA=%d asked to set\n", chg_current);
+		return -EINVAL;
+	}
+	temp = (chg_current - PM8921_CHG_I_MIN_MA) / PM8921_CHG_I_STEP_MA;
+	return pm_chg_masked_write(chip, CHG_IBAT_MAX, PM8921_CHG_I_MASK, temp);
+}
+
+#define PM8921_CHG_IBATSAFE_MIN	225
+#define PM8921_CHG_IBATSAFE_MAX	3375
+static int pm_chg_ibatsafe_set(struct pm8921_chg_chip *chip, int chg_current)
+{
+	u8 temp;
+
+	if (chg_current < PM8921_CHG_IBATSAFE_MIN
+			|| chg_current > PM8921_CHG_IBATSAFE_MAX) {
+		pr_err("bad mA=%d asked to set\n", chg_current);
+		return -EINVAL;
+	}
+	temp = (chg_current - PM8921_CHG_I_MIN_MA) / PM8921_CHG_I_STEP_MA;
+	return pm_chg_masked_write(chip, CHG_IBAT_SAFE,
+						PM8921_CHG_I_MASK, temp);
+}
+
+#define PM8921_CHG_ITERM_MIN_MA		50
+#define PM8921_CHG_ITERM_MAX_MA		200
+#define PM8921_CHG_ITERM_STEP_MA	10
+#define PM8921_CHG_ITERM_MASK		0xF
+static int pm_chg_iterm_set(struct pm8921_chg_chip *chip, int chg_current)
+{
+	u8 temp;
+
+	if (chg_current < PM8921_CHG_ITERM_MIN_MA
+			|| chg_current > PM8921_CHG_ITERM_MAX_MA) {
+		pr_err("bad mA=%d asked to set\n", chg_current);
+		return -EINVAL;
+	}
+
+	temp = (chg_current - PM8921_CHG_ITERM_MIN_MA)
+				/ PM8921_CHG_ITERM_STEP_MA;
+	return pm_chg_masked_write(chip, CHG_ITERM, PM8921_CHG_ITERM_MASK,
+					 temp);
+}
+
+static int pm_chg_iterm_get(struct pm8921_chg_chip *chip, int *chg_current)
+{
+	u8 temp;
+	int rc;
+
+	rc = pm8xxx_readb(chip->dev->parent, CHG_ITERM, &temp);
+	if (rc) {
+		pr_err("err=%d reading CHG_ITEM\n", rc);
+		*chg_current = 0;
+		return rc;
+	}
+	temp &= PM8921_CHG_ITERM_MASK;
+	*chg_current = (int)temp * PM8921_CHG_ITERM_STEP_MA
+					+ PM8921_CHG_ITERM_MIN_MA;
+	return 0;
+}
+
+struct usb_ma_limit_entry {
+	int usb_ma;
+};
+
+static struct usb_ma_limit_entry usb_ma_table[] = {
+	{100},
+	{500},
+	{700},
+	{850},
+	{900},
+	{1100},
+	{1300},
+	{1500},
+};
+
+#define PM8921_CHG_IUSB_MASK 0x1C
+#define PM8921_CHG_IUSB_MAX  7
+#define PM8921_CHG_IUSB_MIN  0
+static int pm_chg_iusbmax_set(struct pm8921_chg_chip *chip, int reg_val)
+{
+	u8 temp;
+
+	if (reg_val < PM8921_CHG_IUSB_MIN || reg_val > PM8921_CHG_IUSB_MAX) {
+		pr_err("bad mA=%d asked to set\n", reg_val);
+		return -EINVAL;
+	}
+	temp = reg_val << 2;
+	return pm_chg_masked_write(chip, PBL_ACCESS2, PM8921_CHG_IUSB_MASK,
+					 temp);
+}
+
+static int pm_chg_iusbmax_get(struct pm8921_chg_chip *chip, int *mA)
+{
+	u8 temp;
+	int rc;
+
+	*mA = 0;
+	rc = pm8xxx_readb(chip->dev->parent, PBL_ACCESS2, &temp);
+	if (rc) {
+		pr_err("err=%d reading PBL_ACCESS2\n", rc);
+		return rc;
+	}
+	temp &= PM8921_CHG_IUSB_MASK;
+	temp = temp >> 2;
+	*mA = usb_ma_table[temp].usb_ma;
+	return rc;
+}
+
+#define PM8921_CHG_WD_MASK 0x1F
+static int pm_chg_disable_wd(struct pm8921_chg_chip *chip)
+{
+	
+	return pm_chg_masked_write(chip, CHG_TWDOG, PM8921_CHG_WD_MASK, 0);
+}
+
+#define PM8921_CHG_TCHG_MASK	0x7F
+#define PM8921_CHG_TCHG_MIN	4
+#define PM8921_CHG_TCHG_MAX	512
+#define PM8921_CHG_TCHG_STEP	4
+static int pm_chg_tchg_max_set(struct pm8921_chg_chip *chip, int minutes)
+{
+	u8 temp;
+
+	if (minutes < PM8921_CHG_TCHG_MIN || minutes > PM8921_CHG_TCHG_MAX) {
+		pr_err("bad max minutes =%d asked to set\n", minutes);
+		return -EINVAL;
+	}
+
+	temp = (minutes - 1)/PM8921_CHG_TCHG_STEP;
+	return pm_chg_masked_write(chip, CHG_TCHG_MAX, PM8921_CHG_TCHG_MASK,
+					 temp);
+}
+
+#define PM8921_CHG_TTRKL_MASK	0x1F
+#define PM8921_CHG_TTRKL_MIN	1
+#define PM8921_CHG_TTRKL_MAX	64
+static int pm_chg_ttrkl_max_set(struct pm8921_chg_chip *chip, int minutes)
+{
+	u8 temp;
+
+	if (minutes < PM8921_CHG_TTRKL_MIN || minutes > PM8921_CHG_TTRKL_MAX) {
+		pr_err("bad max minutes =%d asked to set\n", minutes);
+		return -EINVAL;
+	}
+
+	temp = minutes - 1;
+	return pm_chg_masked_write(chip, CHG_TTRKL_MAX, PM8921_CHG_TTRKL_MASK,
+					 temp);
+}
+
+#define PM8921_CHG_VTRKL_MIN_MV		2050
+#define PM8921_CHG_VTRKL_MAX_MV		2800
+#define PM8921_CHG_VTRKL_STEP_MV	50
+#define PM8921_CHG_VTRKL_SHIFT		4
+#define PM8921_CHG_VTRKL_MASK		0xF0
+static int pm_chg_vtrkl_low_set(struct pm8921_chg_chip *chip, int millivolts)
+{
+	u8 temp;
+
+	if (millivolts < PM8921_CHG_VTRKL_MIN_MV
+			|| millivolts > PM8921_CHG_VTRKL_MAX_MV) {
+		pr_err("bad voltage = %dmV asked to set\n", millivolts);
+		return -EINVAL;
+	}
+
+	temp = (millivolts - PM8921_CHG_VTRKL_MIN_MV)/PM8921_CHG_VTRKL_STEP_MV;
+	temp = temp << PM8921_CHG_VTRKL_SHIFT;
+	return pm_chg_masked_write(chip, CHG_VTRICKLE, PM8921_CHG_VTRKL_MASK,
+					 temp);
+}
+
+#define PM8921_CHG_VWEAK_MIN_MV		2100
+#define PM8921_CHG_VWEAK_MAX_MV		3600
+#define PM8921_CHG_VWEAK_STEP_MV	100
+#define PM8921_CHG_VWEAK_MASK		0x0F
+static int pm_chg_vweak_set(struct pm8921_chg_chip *chip, int millivolts)
+{
+	u8 temp;
+
+	if (millivolts < PM8921_CHG_VWEAK_MIN_MV
+			|| millivolts > PM8921_CHG_VWEAK_MAX_MV) {
+		pr_err("bad voltage = %dmV asked to set\n", millivolts);
+		return -EINVAL;
+	}
+
+	temp = (millivolts - PM8921_CHG_VWEAK_MIN_MV)/PM8921_CHG_VWEAK_STEP_MV;
+	return pm_chg_masked_write(chip, CHG_VTRICKLE, PM8921_CHG_VWEAK_MASK,
+					 temp);
+}
+
+#define PM8921_CHG_ITRKL_MIN_MA		50
+#define PM8921_CHG_ITRKL_MAX_MA		200
+#define PM8921_CHG_ITRKL_MASK		0x0F
+#define PM8921_CHG_ITRKL_STEP_MA	10
+static int pm_chg_itrkl_set(struct pm8921_chg_chip *chip, int milliamps)
+{
+	u8 temp;
+
+	if (milliamps < PM8921_CHG_ITRKL_MIN_MA
+		|| milliamps > PM8921_CHG_ITRKL_MAX_MA) {
+		pr_err("bad current = %dmA asked to set\n", milliamps);
+		return -EINVAL;
+	}
+
+	temp = (milliamps - PM8921_CHG_ITRKL_MIN_MA)/PM8921_CHG_ITRKL_STEP_MA;
+
+	return pm_chg_masked_write(chip, CHG_ITRICKLE, PM8921_CHG_ITRKL_MASK,
+					 temp);
+}
+
+#define PM8921_CHG_IWEAK_MIN_MA		325
+#define PM8921_CHG_IWEAK_MAX_MA		525
+#define PM8921_CHG_IWEAK_SHIFT		7
+#define PM8921_CHG_IWEAK_MASK		0x80
+static int pm_chg_iweak_set(struct pm8921_chg_chip *chip, int milliamps)
+{
+	u8 temp;
+
+	if (milliamps < PM8921_CHG_IWEAK_MIN_MA
+		|| milliamps > PM8921_CHG_IWEAK_MAX_MA) {
+		pr_err("bad current = %dmA asked to set\n", milliamps);
+		return -EINVAL;
+	}
+
+	if (milliamps < PM8921_CHG_IWEAK_MAX_MA)
+		temp = 0;
+	else
+		temp = 1;
+
+	temp = temp << PM8921_CHG_IWEAK_SHIFT;
+	return pm_chg_masked_write(chip, CHG_ITRICKLE, PM8921_CHG_IWEAK_MASK,
+					 temp);
+}
+
+#define PM8921_CHG_BATT_TEMP_THR_COLD	BIT(1)
+#define PM8921_CHG_BATT_TEMP_THR_COLD_SHIFT	1
+static int pm_chg_batt_cold_temp_config(struct pm8921_chg_chip *chip,
+					enum pm8921_chg_cold_thr cold_thr)
+{
+	u8 temp;
+
+	temp = cold_thr << PM8921_CHG_BATT_TEMP_THR_COLD_SHIFT;
+	temp = temp & PM8921_CHG_BATT_TEMP_THR_COLD;
+	return pm_chg_masked_write(chip, CHG_CNTRL_2,
+					PM8921_CHG_BATT_TEMP_THR_COLD,
+					 temp);
+}
+
+#define PM8921_CHG_BATT_TEMP_THR_HOT		BIT(0)
+#define PM8921_CHG_BATT_TEMP_THR_HOT_SHIFT	0
+static int pm_chg_batt_hot_temp_config(struct pm8921_chg_chip *chip,
+					enum pm8921_chg_hot_thr hot_thr)
+{
+	u8 temp;
+
+	temp = hot_thr << PM8921_CHG_BATT_TEMP_THR_HOT_SHIFT;
+	temp = temp & PM8921_CHG_BATT_TEMP_THR_HOT;
+	return pm_chg_masked_write(chip, CHG_CNTRL_2,
+					PM8921_CHG_BATT_TEMP_THR_HOT,
+					 temp);
+}
+
+static void disable_input_voltage_regulation(struct pm8921_chg_chip *chip)
+{
+	u8 temp;
+
+	pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, 0x70);
+	pm8xxx_readb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, &temp);
+	
+	temp |= 0x81;
+	pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, temp);
+}
+
+static void enable_input_voltage_regulation(struct pm8921_chg_chip *chip)
+{
+	u8 temp;
+
+	pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, 0x70);
+	pm8xxx_readb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, &temp);
+	
+	temp &= 0xFE;
+	
+	temp |= 0x80;
+	pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, temp);
+}
+
+static int64_t read_battery_id(struct pm8921_chg_chip *chip)
+{
+	int rc;
+	struct pm8xxx_adc_chan_result result;
+
+	rc = pm8xxx_adc_read(chip->batt_id_channel, &result);
+	if (rc) {
+		pr_err("error reading batt id channel = %d, rc = %d\n",
+					chip->vbat_channel, rc);
+		return rc;
+	}
+	pr_debug("batt_id phy = %lld meas = 0x%llx\n", result.physical,
+						result.measurement);
+	return result.physical;
+}
+
+static int is_battery_valid(struct pm8921_chg_chip *chip)
+{
+	int64_t rc;
+
+	if (chip->batt_id_min == 0 && chip->batt_id_max == 0)
+		return 1;
+
+	rc = read_battery_id(chip);
+	if (rc < 0) {
+		pr_err("error reading batt id channel = %d, rc = %lld\n",
+					chip->vbat_channel, rc);
+		
+		return 1;
+	}
+
+	if (rc < chip->batt_id_min || rc > chip->batt_id_max) {
+		pr_err("batt_id phy =%lld is not valid\n", rc);
+		return 0;
+	}
+	return 1;
+}
+
+static void check_battery_valid(struct pm8921_chg_chip *chip)
+{
+	if (is_battery_valid(chip) == 0) {
+		pr_err("batt_id not valid, disbling charging\n");
+		pm_chg_disable_auto_enable(chip, 1, BATT_CHG_DISABLED_BIT_BAT);
+	} else {
+		pm_chg_disable_auto_enable(chip, 0, BATT_CHG_DISABLED_BIT_BAT);
+	}
+}
+
+static void battery_id_valid(struct work_struct *work)
+{
+	struct pm8921_chg_chip *chip = container_of(work,
+				struct pm8921_chg_chip, battery_id_valid_work);
+
+	check_battery_valid(chip);
+}
+
+static void pm8921_chg_enable_irq(struct pm8921_chg_chip *chip, int interrupt)
+{
+	if (!__test_and_set_bit(interrupt, chip->enabled_irqs)) {
+		dev_dbg(chip->dev, "%d\n", chip->pmic_chg_irq[interrupt]);
+		enable_irq(chip->pmic_chg_irq[interrupt]);
+	}
+}
+
+static void pm8921_chg_disable_irq(struct pm8921_chg_chip *chip, int interrupt)
+{
+	if (__test_and_clear_bit(interrupt, chip->enabled_irqs)) {
+		dev_dbg(chip->dev, "%d\n", chip->pmic_chg_irq[interrupt]);
+		disable_irq_nosync(chip->pmic_chg_irq[interrupt]);
+	}
+}
+
+void pm8921_chg_enable_usbin_valid_irq(void)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return;
+	}
+	pm8921_chg_enable_irq(the_chip, USBIN_VALID_IRQ);
+}
+EXPORT_SYMBOL(pm8921_chg_enable_usbin_valid_irq);
+
+void pm8921_chg_disable_usbin_valid_irq(void)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return;
+	}
+	pm8921_chg_disable_irq(the_chip, USBIN_VALID_IRQ);
+}
+EXPORT_SYMBOL(pm8921_chg_disable_usbin_valid_irq);
+
+static int pm8921_chg_is_enabled(struct pm8921_chg_chip *chip, int interrupt)
+{
+	return test_bit(interrupt, chip->enabled_irqs);
+}
+
+static bool is_using_ext_charger(struct pm8921_chg_chip *chip)
+{
+	if (chip->ext_usb)
+		return true;
+
+	if (chip->ext)
+		return true;
+
+
+	return false;
+}
+
+static bool is_ext_charging(struct pm8921_chg_chip *chip)
+{
+	
+	if ((chip->ext == NULL) && (chip->ext_usb == NULL))
+		return false;
+
+	if (chip->ext_charging || chip->ext_usb_charging)
+		return true;
+
+	return false;
+}
+
+static bool is_ext_trickle_charging(struct pm8921_chg_chip *chip)
+{
+	if (chip->ext == NULL)
+		return false;
+
+	if (chip->ext->is_trickle(chip->ext->ctx))
+		return true;
+
+	return false;
+}
+
+static int is_battery_charging(int fsm_state)
+{
+	if (is_ext_charging(the_chip))
+		return 1;
+
+	switch (fsm_state) {
+	case FSM_STATE_ATC_2A:
+	case FSM_STATE_ATC_2B:
+	case FSM_STATE_ON_CHG_AND_BAT_6:
+	case FSM_STATE_FAST_CHG_7:
+	case FSM_STATE_TRKL_CHG_8:
+		return 1;
+	}
+	return 0;
+}
+
+static void bms_notify(struct work_struct *work)
+{
+	struct bms_notify *n = container_of(work, struct bms_notify, work);
+
+	if (n->is_charging) {
+		pm8921_bms_charging_began();
+	} else {
+		pm8921_bms_charging_end(n->is_battery_full);
+		n->is_battery_full = 0;
+	}
+}
+
+static void bms_notify_check(struct pm8921_chg_chip *chip)
+{
+	int fsm_state, new_is_charging;
+
+	fsm_state = pm_chg_get_fsm_state(chip);
+	new_is_charging = is_battery_charging(fsm_state);
+
+	if (chip->bms_notify.is_charging ^ new_is_charging) {
+		chip->bms_notify.is_charging = new_is_charging;
+		schedule_work(&(chip->bms_notify.work));
+	}
+}
+
+static int get_prop_battery_uvolts(struct pm8921_chg_chip *chip)
+{
+	int rc;
+	struct pm8xxx_adc_chan_result result;
+
+	rc = pm8xxx_adc_read(chip->vbat_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					chip->vbat_channel, rc);
+		return rc;
+	}
+	pr_debug("mvolts phy = %lld meas = 0x%llx\n", result.physical,
+						result.measurement);
+	return (int)result.physical;
+}
+
+static unsigned int voltage_based_capacity(struct pm8921_chg_chip *chip)
+{
+	unsigned int current_voltage_uv = get_prop_battery_uvolts(chip);
+	unsigned int current_voltage_mv = current_voltage_uv / 1000;
+	unsigned int low_voltage = chip->min_voltage_mv;
+	unsigned int high_voltage = chip->max_voltage_mv;
+
+	if (current_voltage_mv <= low_voltage)
+		return 0;
+	else if (current_voltage_mv >= high_voltage)
+		return 100;
+	else
+		return (current_voltage_mv - low_voltage) * 100
+		    / (high_voltage - low_voltage);
+}
+
+static int get_prop_batt_capacity(struct pm8921_chg_chip *chip)
+{
+	int percent_soc = pm8921_bms_get_percent_charge();
+
+	if (percent_soc == -ENXIO)
+		percent_soc = voltage_based_capacity(chip);
+
+	if (percent_soc <= 10)
+		pr_warn("low battery charge = %d%%\n", percent_soc);
+
+	
+	if (test_power_monitor) {
+		pr_info("soc=%d report 77(test_power_monitor)\n",
+				percent_soc);
+		percent_soc = 77;
+	}
+	if (percent_soc < 0) {
+		pr_warn("soc=%d is out of range!\n", percent_soc);
+		percent_soc = 0;
+	} else if (100 < percent_soc) {
+		pr_warn("soc=%d is out of range!\n", percent_soc);
+		percent_soc = 100;
+	}
+
+	return percent_soc;
+}
+
+static int get_prop_batt_current(struct pm8921_chg_chip *chip)
+{
+	int result_ua, rc;
+
+	rc = pm8921_bms_get_battery_current(&result_ua);
+	if (rc == -ENXIO)
+		rc = pm8xxx_ccadc_get_battery_current(&result_ua);
+
+	if (rc) {
+		pr_err("unable to get batt current rc = %d\n", rc);
+		return rc;
+	} else {
+		return result_ua;
+	}
+}
+
+static int get_prop_batt_fcc(struct pm8921_chg_chip *chip)
+{
+	int rc;
+
+	rc = pm8921_bms_get_fcc();
+	if (rc < 0)
+		pr_err("unable to get batt fcc rc = %d\n", rc);
+	return rc;
+}
+
+static int get_prop_batt_health(struct pm8921_chg_chip *chip)
+{
+	int temp;
+
+	
+	if (test_power_monitor) {
+		pr_info("report HEALTH_GOOD(test_power_monitor)\n");
+		return POWER_SUPPLY_HEALTH_GOOD;
+	}
+
+	temp = pm_chg_get_rt_status(chip, BATTTEMP_HOT_IRQ);
+	if (temp){
+		pr_debug("ABHI bat overheat\n");
+		return POWER_SUPPLY_HEALTH_OVERHEAT;
+	}
+
+	temp = pm_chg_get_rt_status(chip, BATTTEMP_COLD_IRQ);
+	if (temp){
+		pr_debug("ABHI bat overcold\n");
+		return POWER_SUPPLY_HEALTH_COLD;
+	}
+
+	return POWER_SUPPLY_HEALTH_GOOD;
+}
+
+static int get_prop_batt_present(struct pm8921_chg_chip *chip)
+{
+	
+	if (test_power_monitor) {
+		pr_info("report batt present (test_power_monitor)\n");
+		return 1;
+	}
+	return pm_chg_get_rt_status(chip, BATT_INSERTED_IRQ);
+}
+
+static int get_prop_charge_type(struct pm8921_chg_chip *chip)
+{
+	int temp;
+
+	if (!get_prop_batt_present(chip))
+		return POWER_SUPPLY_CHARGE_TYPE_NONE;
+
+	if (is_ext_trickle_charging(chip))
+		return POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
+
+	if (is_ext_charging(chip))
+		return POWER_SUPPLY_CHARGE_TYPE_FAST;
+
+	temp = pm_chg_get_rt_status(chip, TRKLCHG_IRQ);
+	if (temp){
+		pr_debug("ABHI %s trickle chg\n", __func__);
+		return POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
+	}
+
+	temp = pm_chg_get_rt_status(chip, FASTCHG_IRQ);
+	if (temp){
+		pr_debug("ABHI %s fast chg\n", __func__);
+		return POWER_SUPPLY_CHARGE_TYPE_FAST;
+	}
+
+	return POWER_SUPPLY_CHARGE_TYPE_NONE;
+}
+
+static int get_prop_batt_status(struct pm8921_chg_chip *chip)
+{
+	int batt_state = POWER_SUPPLY_STATUS_DISCHARGING;
+	int fsm_state = pm_chg_get_fsm_state(chip);
+	int i;
+
+	if (chip->ext_usb) {
+		if (chip->ext_usb_charge_done)
+			return POWER_SUPPLY_STATUS_FULL;
+		if (chip->ext_usb_charging)
+			return POWER_SUPPLY_STATUS_CHARGING;
+	}
+	if (chip->ext) {
+		if (chip->ext_charge_done)
+			return POWER_SUPPLY_STATUS_FULL;
+		if (chip->ext_charging)
+			return POWER_SUPPLY_STATUS_CHARGING;
+	}
+
+	for (i = 0; i < ARRAY_SIZE(map); i++)
+		if (map[i].fsm_state == fsm_state)
+			batt_state = map[i].batt_state;
+
+	if (fsm_state == FSM_STATE_ON_CHG_HIGHI_1) {
+		if (!pm_chg_get_rt_status(chip, BATT_INSERTED_IRQ)
+			|| !pm_chg_get_rt_status(chip, BAT_TEMP_OK_IRQ)
+			|| pm_chg_get_rt_status(chip, CHGHOT_IRQ)
+			|| pm_chg_get_rt_status(chip, VBATDET_LOW_IRQ))
+
+			batt_state = POWER_SUPPLY_STATUS_NOT_CHARGING;
+	}
+	pr_debug("ABHI %d\n",batt_state);
+	return batt_state;
+}
+
+static int get_prop_batt_temp(struct pm8921_chg_chip *chip)
+{
+	int rc;
+	struct pm8xxx_adc_chan_result result;
+
+	rc = pm8xxx_adc_read(chip->batt_temp_channel, &result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					chip->vbat_channel, rc);
+		return rc;
+	}
+	pr_debug("batt_temp phy = %lld meas = 0x%llx\n", result.physical,
+						result.measurement);
+
+	
+	if (test_power_monitor) {
+		pr_info("temp=%d report 25 C(test_power_monitor)\n",
+				(int)result.physical);
+		return 250;
+	}
+
+	pr_debug("ABHI %d deci Deg Cel\n", (int)result.physical);
+	return (int)result.physical;
+}
+
+int pm8921_get_batt_voltage(int *result)
+{
+	int rc;
+	struct pm8xxx_adc_chan_result ch_result;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	rc = pm8xxx_adc_read(the_chip->vbat_channel, &ch_result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					the_chip->vbat_channel, rc);
+		return rc;
+	}
+	*result = ((int)ch_result.physical) / 1000;
+	pr_debug("batt_voltage phy = %lld meas = 0x%llx\n", ch_result.physical,
+						ch_result.measurement);
+	return rc;
+}
+
+int pm8921_get_batt_temperature(int *result)
+{
+	int rc;
+	struct pm8xxx_adc_chan_result ch_result;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &ch_result);
+	if (rc) {
+		pr_err("error reading adc channel = %d, rc = %d\n",
+					the_chip->batt_temp_channel, rc);
+		return rc;
+	}
+	*result = (int)ch_result.physical;
+	if ((*result >= 680) &&
+			(flag_keep_charge_on || flag_pa_recharge))
+		*result = 650;
+	pr_debug("batt_temp phy = %lld meas = 0x%llx\n", ch_result.physical,
+						ch_result.measurement);
+	return rc;
+}
+
+#define PM8921_CHARGER_HTC_FAKE_BATT_ID (1)
+int pm8921_get_batt_id(int *result)
+{
+	int rc = 0;
+	struct pm8xxx_adc_chan_result ch_result;
+	int id_raw_mv;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	
+	if (pm8xxx_get_revision(the_chip->dev->parent) < PM8XXX_REVISION_8921_2p0) {
+		*result = PM8921_CHARGER_HTC_FAKE_BATT_ID;
+	} else {
+		rc = pm8xxx_adc_read(the_chip->batt_id_channel, &ch_result);
+		if (rc) {
+			pr_err("error reading adc channel = %d, rc = %d\n",
+					the_chip->batt_id_channel, rc);
+			return rc;
+		}
+		pr_debug("batt_id phy = %lld meas = 0x%llx\n", ch_result.physical,
+						ch_result.measurement);
+		id_raw_mv = ((int)ch_result.physical) / 1000;
+		
+		*result = htc_battery_cell_find_and_set_id_auto(id_raw_mv);
+	}
+	return rc;
+}
+
+int pm8921_is_batt_temperature_fault(int *result)
+{
+	int is_cold, is_warm;
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	is_cold = pm_chg_get_rt_status(the_chip, BATTTEMP_COLD_IRQ);
+	is_warm = pm8xxx_adc_btm_is_warm();
+
+	pr_debug("is_cold=%d,is_warm=%d\n", is_cold, is_warm);
+	if (is_cold || is_warm)
+		*result = 1;
+	else
+		*result = 0;
+	return 0;
+}
+
+int pm8921_is_batt_temp_fault_disable_chg(int *result)
+{
+	int is_cold, is_hot;
+	int is_warm, is_vbatdet_low;
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if(the_chip->ext_usb)
+	{
+		if(the_chip->ext_usb->ichg->is_batt_temp_fault_disable_chg)
+			the_chip->ext_usb->ichg->is_batt_temp_fault_disable_chg(result);
+		return 0;
+	}
+
+
+	is_cold = pm_chg_get_rt_status(the_chip, BATTTEMP_COLD_IRQ);
+	is_hot = pm_chg_get_rt_status(the_chip, BATTTEMP_HOT_IRQ);
+	is_warm = pm8xxx_adc_btm_is_warm();
+	is_vbatdet_low = pm_chg_get_rt_status(the_chip, VBATDET_LOW_IRQ);
+
+	pr_debug("is_cold=%d, is_hot=%d, is_warm=%d, is_vbatdet_low=%d\n",
+			is_cold, is_hot, is_warm, is_vbatdet_low);
+	if ((is_cold || (is_hot && is_warm) || (is_warm && !is_vbatdet_low)) &&
+			!flag_keep_charge_on && !flag_pa_recharge)
+		*result = 1;
+	else
+		*result = 0;
+	return 0;
+}
+
+int pm8921_is_batt_full(int *result)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	*result = is_batt_full;
+	return 0;
+}
+int pm8921_gauge_get_attr_text(char *buf, int size)
+{
+	int len = 0;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	len += scnprintf(buf + len, size - len,
+			"SOC(%%): %d;\n"
+			"EOC(bool): %d;\n"
+			"OVP(bool): %d;\n"
+			"UVP(bool): %d;\n"
+			"VBAT(uV): %d;\n"
+			"IBAT(uA): %d;\n"
+			"ID_RAW(uV): %d;\n"
+			"BATT_TEMP(deci-celsius): %d;\n"
+			"is_bat_warm(bool): %d\n"
+			"is_bat_cool(bool): %d\n"
+			"BTM_WARM_IRQ: %d\n"
+			"BTM_COOL_IRQ: %d\n"
+			"BATT_PRESENT(bool): %d;\n"
+			"FCC(uAh): %d;\n"
+			"usb_target_ma(mA): %d;\n",
+			pm8921_bms_get_percent_charge(),
+			is_batt_full,
+			ovp,
+			uvp,
+			get_prop_battery_uvolts(the_chip),
+			get_prop_batt_current(the_chip),
+			(int)read_battery_id(the_chip),
+			get_prop_batt_temp(the_chip),
+			the_chip->is_bat_warm,
+			the_chip->is_bat_cool,
+			pm8xxx_adc_btm_is_warm(),
+			pm8xxx_adc_btm_is_cool(),
+			get_prop_batt_present(the_chip),
+			pm8921_bms_get_fcc(),
+			usb_target_ma
+			);
+
+	len += pm8921_bms_get_attr_text(buf + len, size - len);
+
+	return len;
+}
+int pm8921_pwrsrc_enable(bool enable)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if(the_chip->ext_usb)
+	{
+		if(the_chip->ext_usb->ichg->set_pwrsrc_enable)
+			return the_chip->ext_usb->ichg->set_pwrsrc_enable(enable);
+	}
+
+	return pm_chg_disable_pwrsrc(the_chip, !enable, PWRSRC_DISABLED_BIT_KDRV);
+}
+EXPORT_SYMBOL(pm8921_pwrsrc_enable);
+
+int pm8921_get_charging_source(int *result)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if(the_chip->ext_usb)
+	{
+		if(the_chip->ext_usb->ichg->get_charging_source)
+			the_chip->ext_usb->ichg->get_charging_source(result);
+		return 0;
+	}
+
+	*result = pwr_src;
+
+
+	return 0;
+}
+
+int pm8921_get_charging_enabled(int *result)
+{
+	int fsm_state;
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if(the_chip->ext_usb)
+	{
+		if(the_chip->ext_usb->ichg->get_charging_enabled)
+			return the_chip->ext_usb->ichg->get_charging_enabled(result);
+	}
+
+	fsm_state = pm_chg_get_fsm_state(the_chip);
+	if (is_battery_charging(fsm_state))
+		return pm8921_get_charging_source(result);
+	else
+		*result = HTC_PWR_SOURCE_TYPE_BATT;
+	return 0;
+}
+
+int pm8921_is_charger_ovp(int* result)
+{
+	int ov, uv, v;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	ov = pm_chg_get_rt_status(the_chip, USBIN_OV_IRQ);
+	v = pm_chg_get_rt_status(the_chip, USBIN_VALID_IRQ);
+	uv = pm_chg_get_rt_status(the_chip, USBIN_UV_IRQ);
+	pr_info("usbin_ov_irq_state:%d -> %d [%d,%d,%d]\n",
+					usbin_ov_irq_state, ov, ov, v, uv);
+	usbin_ov_irq_state = ov;
+	update_ovp_uvp_state(ov, v, uv);
+	*result = ovp;
+
+	if(the_chip->ext_usb)
+	{
+		if(the_chip->ext_usb->ichg->is_ovp)
+			the_chip->ext_usb->ichg->is_ovp(result);
+	}
+
+	return 0;
+}
+
+int pm8921_charger_get_attr_text_with_ext_charger(char *buf, int size)
+{
+	int rc;
+	int len = 0;
+	struct pm8xxx_adc_chan_result result;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	len += scnprintf(buf + len, size - len,
+			"FSM: %d;\n"
+			"ATCDONE_IRQ: %d;\n"
+			"ATCFAIL_IRQ: %d;\n"
+			"BATFET_IRQ: %d;\n"
+			"BATTTEMP_COLD_IRQ: %d;\n"
+			"BATTTEMP_HOT_IRQ: %d;\n"
+			"BATT_INSERTED_IRQ: %d;\n"
+			"BATT_REMOVED_IRQ: %d;\n"
+			"BAT_TEMP_OK_IRQ: %d;\n"
+			"DCIN_UV_IRQ: %d;\n"
+			"DCIN_VALID_IRQ: %d;\n"
+			"LOOP_CHANGE_IRQ: %d;\n"
+			"TRKLCHG_IRQ: %d;\n"
+			"USBIN_OV_IRQ: %d;\n"
+			"USBIN_UV_IRQ: %d;\n"
+			"USBIN_VALID_IRQ: %d;\n"
+			"VBATDET_IRQ: %d;\n"
+			"VBATDET_LOW_IRQ: %d;\n"
+			"VBAT_OV_IRQ: %d;\n"
+			"VCP_IRQ: %d;\n"
+			"VDD_LOOP_IRQ: %d;\n"
+			"VREG_OV_IRQ: %d;\n"
+			"REGULATION_LOOP: 0x%02x\n",
+			pm_chg_get_fsm_state(the_chip),
+			pm_chg_get_rt_status(the_chip, ATCDONE_IRQ),
+			pm_chg_get_rt_status(the_chip, ATCFAIL_IRQ),
+			pm_chg_get_rt_status(the_chip, BATFET_IRQ),
+			pm_chg_get_rt_status(the_chip, BATTTEMP_COLD_IRQ),
+			pm_chg_get_rt_status(the_chip, BATTTEMP_HOT_IRQ),
+			pm_chg_get_rt_status(the_chip, BATT_INSERTED_IRQ),
+			pm_chg_get_rt_status(the_chip, BATT_REMOVED_IRQ),
+			pm_chg_get_rt_status(the_chip, BAT_TEMP_OK_IRQ),
+			pm_chg_get_rt_status(the_chip, DCIN_UV_IRQ),
+			pm_chg_get_rt_status(the_chip, DCIN_VALID_IRQ),
+			pm_chg_get_rt_status(the_chip, LOOP_CHANGE_IRQ),
+			pm_chg_get_rt_status(the_chip, TRKLCHG_IRQ),
+			pm_chg_get_rt_status(the_chip, USBIN_OV_IRQ),
+			pm_chg_get_rt_status(the_chip, USBIN_UV_IRQ),
+			pm_chg_get_rt_status(the_chip, USBIN_VALID_IRQ),
+			pm_chg_get_rt_status(the_chip, VBATDET_IRQ),
+			pm_chg_get_rt_status(the_chip, VBATDET_LOW_IRQ),
+			pm_chg_get_rt_status(the_chip, VBAT_OV_IRQ),
+			pm_chg_get_rt_status(the_chip, VCP_IRQ),
+			pm_chg_get_rt_status(the_chip, VDD_LOOP_IRQ),
+			pm_chg_get_rt_status(the_chip, VREG_OV_IRQ),
+			pm_chg_get_regulation_loop(the_chip)
+			);
+
+	rc = pm8xxx_adc_read(CHANNEL_USBIN, &result);
+	if (rc) {
+		pr_err("error reading i_chg channel = %d, rc = %d\n",
+					CHANNEL_USBIN, rc);
+	}
+
+	len += scnprintf(buf + len, size - len,
+			"USBIN(uV): %d;\n", (int)result.physical);
+
+	pr_info("USBIN(uV): %d;\n", (int)result.physical);
+
+	if(the_chip->ext_usb)
+	{
+		if(the_chip->ext_usb->ichg->get_attr_text)
+			len += the_chip->ext_usb->ichg->get_attr_text(buf+len, size);
+	}
+
+	return len;
+}
+
+
+int pm8921_charger_get_attr_text(char *buf, int size)
+{
+	int rc;
+	struct pm8xxx_adc_chan_result result;
+	int len = 0;
+	u64 val = 0;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	len += scnprintf(buf + len, size - len,
+			"FSM: %d;\n"
+			"ATCDONE_IRQ: %d;\n"
+			"ATCFAIL_IRQ: %d;\n"
+			"BATFET_IRQ: %d;\n"
+			"BATTTEMP_COLD_IRQ: %d;\n"
+			"BATTTEMP_HOT_IRQ: %d;\n"
+			"BATT_INSERTED_IRQ: %d;\n"
+			"BATT_REMOVED_IRQ: %d;\n"
+			"BAT_TEMP_OK_IRQ: %d;\n"
+			"CHGDONE_IRQ: %d;\n"
+			"CHGFAIL_IRQ: %d;\n"
+			"CHGHOT_IRQ: %d;\n"
+			"CHGSTATE_IRQ: %d;\n"
+			"CHGWDOG_IRQ: %d;\n"
+			"CHG_GONE_IRQ: %d;\n"
+			"COARSE_DET_LOW_IRQ: %d;\n"
+			"DCIN_OV_IRQ: %d;\n"
+			"DCIN_UV_IRQ: %d;\n"
+			"DCIN_VALID_IRQ: %d;\n"
+			"USBIN_OV_IRQ: %d;\n"
+			"USBIN_UV_IRQ: %d;\n"
+			"USBIN_VALID_IRQ: %d;\n"
+			"FASTCHG_IRQ: %d;\n"
+			"LOOP_CHANGE_IRQ: %d;\n"
+			"TRKLCHG_IRQ: %d;\n"
+			"VBATDET_IRQ: %d;\n"
+			"VBATDET_LOW_IRQ: %d;\n"
+			"VBAT_OV_IRQ: %d;\n"
+			"VCP_IRQ: %d;\n"
+			"VDD_LOOP_IRQ: %d;\n"
+			"VREG_OV_IRQ: %d;\n"
+			"REGULATION_LOOP: 0x%02x\n",
+			pm_chg_get_fsm_state(the_chip),
+			pm_chg_get_rt_status(the_chip, ATCDONE_IRQ),
+			pm_chg_get_rt_status(the_chip, ATCFAIL_IRQ),
+			pm_chg_get_rt_status(the_chip, BATFET_IRQ),
+			pm_chg_get_rt_status(the_chip, BATTTEMP_COLD_IRQ),
+			pm_chg_get_rt_status(the_chip, BATTTEMP_HOT_IRQ),
+			pm_chg_get_rt_status(the_chip, BATT_INSERTED_IRQ),
+			pm_chg_get_rt_status(the_chip, BATT_REMOVED_IRQ),
+			pm_chg_get_rt_status(the_chip, BAT_TEMP_OK_IRQ),
+			pm_chg_get_rt_status(the_chip, CHGDONE_IRQ),
+			pm_chg_get_rt_status(the_chip, CHGFAIL_IRQ),
+			pm_chg_get_rt_status(the_chip, CHGHOT_IRQ),
+			pm_chg_get_rt_status(the_chip, CHGSTATE_IRQ),
+			pm_chg_get_rt_status(the_chip, CHGWDOG_IRQ),
+			pm_chg_get_rt_status(the_chip, CHG_GONE_IRQ),
+			pm_chg_get_rt_status(the_chip, COARSE_DET_LOW_IRQ),
+			pm_chg_get_rt_status(the_chip, DCIN_OV_IRQ),
+			pm_chg_get_rt_status(the_chip, DCIN_UV_IRQ),
+			pm_chg_get_rt_status(the_chip, DCIN_VALID_IRQ),
+			pm_chg_get_rt_status(the_chip, USBIN_OV_IRQ),
+			pm_chg_get_rt_status(the_chip, USBIN_UV_IRQ),
+			pm_chg_get_rt_status(the_chip, USBIN_VALID_IRQ),
+			pm_chg_get_rt_status(the_chip, FASTCHG_IRQ),
+			pm_chg_get_rt_status(the_chip, LOOP_CHANGE_IRQ),
+			pm_chg_get_rt_status(the_chip, TRKLCHG_IRQ),
+			pm_chg_get_rt_status(the_chip, VBATDET_IRQ),
+			pm_chg_get_rt_status(the_chip, VBATDET_LOW_IRQ),
+			pm_chg_get_rt_status(the_chip, VBAT_OV_IRQ),
+			pm_chg_get_rt_status(the_chip, VCP_IRQ),
+			pm_chg_get_rt_status(the_chip, VDD_LOOP_IRQ),
+			pm_chg_get_rt_status(the_chip, VREG_OV_IRQ),
+			pm_chg_get_regulation_loop(the_chip)
+			);
+
+	rc = pm8xxx_adc_read(CHANNEL_USBIN, &result);
+	if (rc) {
+		pr_err("error reading i_chg channel = %d, rc = %d\n",
+					CHANNEL_USBIN, rc);
+	}
+
+	len += scnprintf(buf + len, size - len,
+			"USBIN(uV): %d;\n", (int)result.physical);
+
+	rc = pm8xxx_adc_read(CHANNEL_VPH_PWR, &result);
+	if (rc) {
+		pr_err("error reading vph_pwr channel = %d, rc = %d\n",
+					CHANNEL_VPH_PWR, rc);
+	}
+	len += scnprintf(buf + len, size - len,
+			"VPH_PWR(uV): %d;\n", (int)result.physical);
+
+	len += scnprintf(buf + len, size - len,
+			"AC_SAFETY_TIMEOUT(bool): %d;\n", (int)is_ac_safety_timeout);
+
+	len += scnprintf(buf + len, size - len,
+			"AC_SAFETY_TIMEOUT2(bool): %d;\n", (int)is_ac_safety_timeout_twice);
+
+	len += scnprintf(buf + len, size - len,
+			"mitigation_level(int): %d;\n", thermal_mitigation);
+
+	len += scnprintf(buf + len, size - len,
+			"eoc_count(int): %d;\n", eoc_count);
+
+	get_reg((void *)CHG_CNTRL, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_CNTRL: 0x%llx;\n", val);
+	get_reg((void *)CHG_CNTRL_2, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_CNTRL_2: 0x%llx;\n", val);
+	get_reg((void *)CHG_CNTRL_3, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_CNTRL_3: 0x%llx;\n", val);
+	get_reg((void *)PBL_ACCESS1, &val);
+	len += scnprintf(buf + len, size - len,
+			"PBL_ACCESS1: 0x%llx;\n", val);
+	get_reg((void *)PBL_ACCESS2, &val);
+	len += scnprintf(buf + len, size - len,
+			"PBL_ACCESS2: 0x%llx;\n", val);
+	get_reg((void *)SYS_CONFIG_1, &val);
+	len += scnprintf(buf + len, size - len,
+			"SYS_CONFIG_1: 0x%llx;\n", val);
+	get_reg((void *)SYS_CONFIG_2, &val);
+	len += scnprintf(buf + len, size - len,
+			"SYS_CONFIG_2: 0x%llx;\n", val);
+	get_reg((void *)CHG_IBAT_MAX, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_IBAT_MAX: 0x%llx;\n", val);
+	get_reg((void *)CHG_IBAT_SAFE, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_IBAT_SAFE: 0x%llx;\n", val);
+	get_reg((void *)CHG_VDD_MAX, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_VDD_MAX: 0x%llx;\n", val);
+	get_reg((void *)CHG_VDD_SAFE, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_VDD_SAFE: 0x%llx;\n", val);
+	get_reg((void *)CHG_VBAT_DET, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_VBAT_DET: 0x%llx;\n", val);
+	get_reg((void *)CHG_VIN_MIN, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_VIN_MIN: 0x%llx;\n", val);
+	get_reg((void *)CHG_VTRICKLE, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_VTRICKLE: 0x%llx;\n", val);
+	get_reg((void *)CHG_ITRICKLE, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_ITRICKLE: 0x%llx;\n", val);
+	get_reg((void *)CHG_ITERM, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_ITERM: 0x%llx;\n", val);
+	get_reg((void *)CHG_TCHG_MAX, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_TCHG_MAX: 0x%llx;\n", val);
+	get_reg((void *)CHG_TWDOG, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_TWDOG: 0x%llx;\n", val);
+	get_reg((void *)CHG_TEMP_THRESH, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_TEMP_THRESH: 0x%llx;\n", val);
+	get_reg((void *)CHG_COMP_OVR, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_COMP_OVR: 0x%llx;\n", val);
+	get_reg((void *)CHG_BUCK_CTRL_TEST1, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_BUCK_CTRL_TEST1: 0x%llx;\n", val);
+	get_reg((void *)CHG_BUCK_CTRL_TEST2, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_BUCK_CTRL_TEST2: 0x%llx;\n", val);
+	get_reg((void *)CHG_BUCK_CTRL_TEST3, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_BUCK_CTRL_TEST3: 0x%llx;\n", val);
+	get_reg((void *)CHG_TEST, &val);
+	len += scnprintf(buf + len, size - len,
+			"CHG_TEST: 0x%llx;\n", val);
+	get_reg((void *)USB_OVP_CONTROL, &val);
+	len += scnprintf(buf + len, size - len,
+			"USB_OVP_CONTROL: 0x%llx;\n", val);
+	get_reg((void *)USB_OVP_TEST, &val);
+	len += scnprintf(buf + len, size - len,
+			"USB_OVP_TEST: 0x%llx;\n", val);
+	get_reg((void *)DC_OVP_CONTROL, &val);
+	len += scnprintf(buf + len, size - len,
+			"DC_OVP_CONTROL: 0x%llx;\n", val);
+	get_reg((void *)DC_OVP_TEST, &val);
+	len += scnprintf(buf + len, size - len,
+			"DC_OVP_TEST: 0x%llx;\n", val);
+
+	return len;
+}
+
+static void (*notify_vbus_state_func_ptr)(int);
+static int usb_chg_current;
+static DEFINE_SPINLOCK(vbus_lock);
+
+int pm8921_charger_register_vbus_sn(void (*callback)(int))
+{
+	pr_debug("%p\n", callback);
+	notify_vbus_state_func_ptr = callback;
+	return 0;
+}
+EXPORT_SYMBOL_GPL(pm8921_charger_register_vbus_sn);
+
+void pm8921_charger_unregister_vbus_sn(void (*callback)(int))
+{
+	pr_debug("%p\n", callback);
+	notify_vbus_state_func_ptr = NULL;
+}
+EXPORT_SYMBOL_GPL(pm8921_charger_unregister_vbus_sn);
+
+static void notify_usb_of_the_plugin_event(int plugin)
+{
+	plugin = !!plugin;
+	if (notify_vbus_state_func_ptr) {
+		pr_debug("notifying plugin\n");
+		(*notify_vbus_state_func_ptr) (plugin);
+	} else {
+		pr_debug("unable to notify plugin\n");
+	}
+}
+
+static void __pm8921_charger_vbus_draw(unsigned int mA)
+{
+	int i, rc;
+
+	if (mA > 0 && mA <= 2) {
+		usb_chg_current = 0;
+		rc = pm_chg_iusbmax_set(the_chip, 0);
+		if (rc)
+			pr_err("unable to set iusb to %d rc = %d\n", 0, rc);
+		rc = pm_chg_usb_suspend_enable(the_chip, 1);
+		if (rc)
+			pr_err("fail to set suspend bit rc=%d\n", rc);
+	} else {
+		rc = pm_chg_usb_suspend_enable(the_chip, 0);
+		if (rc)
+			pr_err("fail to reset suspend bit rc=%d\n", rc);
+		for (i = ARRAY_SIZE(usb_ma_table) - 1; i >= 0; i--) {
+			if (usb_ma_table[i].usb_ma <= mA)
+				break;
+		}
+		if (i < 0)
+			i = 0;
+		rc = pm_chg_iusbmax_set(the_chip, i);
+		if (rc)
+			pr_err("unable to set iusb to %d rc = %d\n", i, rc);
+	}
+}
+
+#define USB_WALL_THRESHOLD_MA	(1500)
+static void _pm8921_charger_vbus_draw(unsigned int mA)
+{
+	unsigned long flags;
+
+	if (usb_max_current && mA > usb_max_current) {
+		pr_warn("restricting usb current to %d instead of %d\n",
+					usb_max_current, mA);
+		mA = usb_max_current;
+	}
+	if (usb_target_ma == 0 && mA > USB_WALL_THRESHOLD_MA)
+		usb_target_ma = mA;
+
+	spin_lock_irqsave(&vbus_lock, flags);
+	if (the_chip) {
+		if (mA > USB_WALL_THRESHOLD_MA)
+			__pm8921_charger_vbus_draw(USB_WALL_THRESHOLD_MA);
+		else
+			__pm8921_charger_vbus_draw(mA);
+	} else {
+		if (mA > USB_WALL_THRESHOLD_MA)
+			usb_chg_current = USB_WALL_THRESHOLD_MA;
+		else
+			usb_chg_current = mA;
+	}
+	spin_unlock_irqrestore(&vbus_lock, flags);
+}
+
+static void handle_usb_present_change(struct pm8921_chg_chip *chip,
+				int usb_present)
+{
+	int rc = 0;
+
+	if (pm_chg_failed_clear(chip, 1))
+		pr_err("Failed to write CHG_FAILED_CLEAR bit\n");
+	if (chip->usb_present ^ usb_present) {
+		pr_info("vbus present change: %d -> %d\n",
+		chip->usb_present, usb_present);
+		chip->usb_present = usb_present;
+
+		if (usb_present) {
+			is_cable_remove = false;
+		} else {
+			rc = pm_chg_disable_auto_enable(chip, 0, BATT_CHG_DISABLED_BIT_EOC);
+			if (rc)
+				pr_err("Failed to set auto_enable rc=%d\n", rc);
+
+			is_batt_full = false;
+			eoc_count = 0;
+			is_ac_safety_timeout = is_ac_safety_timeout_twice = false;
+			is_cable_remove = true;
+
+			pr_info("Set vbatdet=%d after cable out\n",
+					PM8921_CHG_VBATDET_MAX);
+			rc = pm_chg_vbatdet_set(chip, PM8921_CHG_VBATDET_MAX);
+			if (rc)
+				pr_err("Failed to set vbatdet=%d rc=%d\n",
+						PM8921_CHG_VBATDET_MAX, rc);
+		}
+		usbin_ov_irq_handler(chip->pmic_chg_irq[USBIN_OV_IRQ], chip);
+	}
+
+	if (usb_present) {
+			schedule_delayed_work(&chip->unplug_check_work,
+				round_jiffies_relative(msecs_to_jiffies
+					(UNPLUG_CHECK_WAIT_PERIOD_MS)));
+			pm8921_chg_enable_irq(chip, CHG_GONE_IRQ);
+	} else {
+			
+			usb_target_ma = 0;
+			pm8921_chg_disable_irq(chip, CHG_GONE_IRQ);
+	}
+	enable_input_voltage_regulation(chip);
+
+	bms_notify_check(chip);
+}
+
+static u32 htc_fake_charger_for_testing(enum htc_power_source_type src)
+{
+	
+	enum htc_power_source_type new_src = HTC_PWR_SOURCE_TYPE_AC;
+
+	if((src > HTC_PWR_SOURCE_TYPE_9VAC) || (src == HTC_PWR_SOURCE_TYPE_BATT))
+		return src;
+
+	pr_info("%s(%d -> %d)\n", __func__, src , new_src);
+	return new_src;
+}
+
+
+int pm8921_set_pwrsrc_and_charger_enable(enum htc_power_source_type src,
+		bool chg_enable, bool pwrsrc_enable)
+{
+	int mA = 0;
+	int rc = 0;
+
+	pr_info("src=%d, chg_enable=%d, pwrsrc_enable=%d\n",
+				src, chg_enable, pwrsrc_enable);
+
+	if (get_kernel_flag() & KERNEL_FLAG_ENABLE_FAST_CHARGE)
+		src = htc_fake_charger_for_testing(src);
+
+
+	pwr_src = src;
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if(the_chip->ext_usb)
+	{
+		if(the_chip->ext_usb->ichg->set_pwrsrc_and_charger_enable)
+			rc = the_chip->ext_usb->ichg->set_pwrsrc_and_charger_enable(src, chg_enable, pwrsrc_enable);
+
+		if(chg_enable)
+		{
+			if (!flag_disable_wakelock)
+				wake_lock(&the_chip->eoc_wake_lock);
+
+			schedule_delayed_work(&the_chip->eoc_work,
+			      round_jiffies_relative(msecs_to_jiffies
+					(EOC_CHECK_PERIOD_MS)));
+
+			pr_info("schedule_delayed_work(&the_chip->eoc_wora)k\n");
+
+		}
+		return rc;
+	}
+
+	
+	pm_chg_disable_pwrsrc(the_chip, !pwrsrc_enable, PWRSRC_DISABLED_BIT_KDRV);
+
+	
+	pm_chg_disable_auto_enable(the_chip, !chg_enable,
+								BATT_CHG_DISABLED_BIT_KDRV);
+
+	
+	switch (src) {
+	case HTC_PWR_SOURCE_TYPE_BATT:
+		mA = USB_MA_2;
+		break;
+	case HTC_PWR_SOURCE_TYPE_WIRELESS:
+		if (pm8921_is_dc_chg_plugged_in()) {
+			pr_info("Wireless charger is from DC_IN\n");
+			mA = USB_MA_1100;
+		} else
+			mA = USB_MA_500;
+		break;
+	case HTC_PWR_SOURCE_TYPE_USB:
+		mA = USB_MA_500;
+		break;
+	case HTC_PWR_SOURCE_TYPE_AC:
+	case HTC_PWR_SOURCE_TYPE_9VAC:
+	case HTC_PWR_SOURCE_TYPE_MHL_AC:
+		mA = USB_MA_1100;
+		break;
+	default:
+		mA = USB_MA_2;
+		break;
+	}
+	_pm8921_charger_vbus_draw(mA);
+	if (HTC_PWR_SOURCE_TYPE_BATT == src)
+		handle_usb_present_change(the_chip, 0);
+	else
+		handle_usb_present_change(the_chip, 1);
+
+	return rc;
+}
+EXPORT_SYMBOL(pm8921_set_pwrsrc_and_charger_enable);
+
+void pm8921_charger_vbus_draw(unsigned int mA)
+{
+	unsigned long flags;
+
+	pr_info("Enter charge=%d (deprecated api)\n", mA);
+	return;
+
+	if (usb_max_current && mA > usb_max_current) {
+		pr_warn("restricting usb current to %d instead of %d\n",
+					usb_max_current, mA);
+		mA = usb_max_current;
+	}
+	if (usb_target_ma == 0 && mA > USB_WALL_THRESHOLD_MA)
+		usb_target_ma = mA;
+
+	spin_lock_irqsave(&vbus_lock, flags);
+	if (the_chip) {
+		if (mA > USB_WALL_THRESHOLD_MA)
+			__pm8921_charger_vbus_draw(USB_WALL_THRESHOLD_MA);
+		else
+			__pm8921_charger_vbus_draw(mA);
+	} else {
+		if (mA > USB_WALL_THRESHOLD_MA)
+			usb_chg_current = USB_WALL_THRESHOLD_MA;
+		else
+			usb_chg_current = mA;
+	}
+	spin_unlock_irqrestore(&vbus_lock, flags);
+}
+EXPORT_SYMBOL_GPL(pm8921_charger_vbus_draw);
+
+int pm8921_charger_enable(bool enable)
+{
+	int rc = 0;
+
+	
+	if(the_chip->ext_usb)
+	{
+		if(the_chip->ext_usb->ichg->set_charger_enable)
+		{
+			rc = the_chip->ext_usb->ichg->set_charger_enable(enable);
+			return rc;
+		}
+	}
+
+	if (the_chip) {
+		enable = !!enable;
+		rc = pm_chg_disable_auto_enable(the_chip, !enable, BATT_CHG_DISABLED_BIT_KDRV);
+	} else {
+		pr_err("called before init\n");
+		rc = -EINVAL;
+	}
+
+
+
+	return rc;
+}
+EXPORT_SYMBOL(pm8921_charger_enable);
+
+int pm8921_is_usb_chg_plugged_in(void)
+{
+	if (!the_chip) {
+		pr_warn("%s: warn: called before init\n", __func__);
+		return -EINVAL;
+	}
+	return is_usb_chg_plugged_in(the_chip);
+}
+EXPORT_SYMBOL(pm8921_is_usb_chg_plugged_in);
+
+int pm8921_is_dc_chg_plugged_in(void)
+{
+	if (!the_chip) {
+		pr_warn("%s: warn: called before init\n", __func__);
+		return -EINVAL;
+	}
+	return is_dc_chg_plugged_in(the_chip);
+}
+EXPORT_SYMBOL(pm8921_is_dc_chg_plugged_in);
+
+int pm8921_is_pwr_src_plugged_in(void)
+{
+	int usb_in, dc_in;
+
+	usb_in = pm8921_is_usb_chg_plugged_in();
+	dc_in = pm8921_is_dc_chg_plugged_in();
+	pr_info("%s: usb_in=%d, dc_in=%d\n", __func__, usb_in, dc_in);
+	if (usb_in ^ dc_in)
+		return 1;
+	else if (usb_in & dc_in)
+		pr_warn("%s: Abnormal interrupt due to usb_in & dc_in"
+				" is existed together\n", __func__);
+	return 0;
+}
+EXPORT_SYMBOL(pm8921_is_pwr_src_plugged_in);
+
+int pm8921_is_battery_present(void)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	return get_prop_batt_present(the_chip);
+}
+EXPORT_SYMBOL(pm8921_is_battery_present);
+
+int pm8921_disable_input_current_limit(bool disable)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	if (disable) {
+		pr_warn("Disabling input current limit!\n");
+
+		return pm8xxx_writeb(the_chip->dev->parent,
+			 CHG_BUCK_CTRL_TEST3, 0xF2);
+	}
+	return 0;
+}
+EXPORT_SYMBOL(pm8921_disable_input_current_limit);
+
+int pm8921_set_max_battery_charge_current(int ma)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	return pm_chg_ibatmax_set(the_chip, ma);
+}
+EXPORT_SYMBOL(pm8921_set_max_battery_charge_current);
+
+int pm8921_disable_source_current(bool disable)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	if (disable)
+		pr_warn("current drawn from chg=0, battery provides current\n");
+	return pm_chg_disable_pwrsrc(the_chip, disable, PWRSRC_DISABLED_BIT_KDRV);
+}
+EXPORT_SYMBOL(pm8921_disable_source_current);
+
+int pm8921_regulate_input_voltage(int voltage)
+{
+	int rc;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	rc = pm_chg_vinmin_set(the_chip, voltage);
+
+	if (rc == 0)
+		the_chip->vin_min = voltage;
+
+	return rc;
+}
+
+#define USB_OV_THRESHOLD_MASK  0x60
+#define USB_OV_THRESHOLD_SHIFT  5
+int pm8921_usb_ovp_set_threshold(enum pm8921_usb_ov_threshold ov)
+{
+	u8 temp;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if (ov > PM_USB_OV_7V) {
+		pr_err("limiting to over voltage threshold to 7volts\n");
+		ov = PM_USB_OV_7V;
+	}
+
+	temp = USB_OV_THRESHOLD_MASK & (ov << USB_OV_THRESHOLD_SHIFT);
+
+	return pm_chg_masked_write(the_chip, USB_OVP_CONTROL,
+				USB_OV_THRESHOLD_MASK, temp);
+}
+EXPORT_SYMBOL(pm8921_usb_ovp_set_threshold);
+
+#define USB_DEBOUNCE_TIME_MASK	0x06
+#define USB_DEBOUNCE_TIME_SHIFT 1
+int pm8921_usb_ovp_set_hystersis(enum pm8921_usb_debounce_time ms)
+{
+	u8 temp;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if (ms > PM_USB_DEBOUNCE_80P5MS) {
+		pr_err("limiting debounce to 80.5ms\n");
+		ms = PM_USB_DEBOUNCE_80P5MS;
+	}
+
+	temp = USB_DEBOUNCE_TIME_MASK & (ms << USB_DEBOUNCE_TIME_SHIFT);
+
+	return pm_chg_masked_write(the_chip, USB_OVP_CONTROL,
+				USB_DEBOUNCE_TIME_MASK, temp);
+}
+EXPORT_SYMBOL(pm8921_usb_ovp_set_hystersis);
+
+#define USB_OVP_DISABLE_MASK	0x80
+int pm8921_usb_ovp_disable(int disable)
+{
+	u8 temp = 0;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if (disable)
+		temp = USB_OVP_DISABLE_MASK;
+
+	return pm_chg_masked_write(the_chip, USB_OVP_CONTROL,
+				USB_OVP_DISABLE_MASK, temp);
+}
+
+bool pm8921_is_battery_charging(int *source)
+{
+	int fsm_state, is_charging, dc_present, usb_present;
+
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	fsm_state = pm_chg_get_fsm_state(the_chip);
+	is_charging = is_battery_charging(fsm_state);
+	if (is_charging == 0) {
+		*source = PM8921_CHG_SRC_NONE;
+		return is_charging;
+	}
+
+	if (source == NULL)
+		return is_charging;
+
+	
+	dc_present = is_dc_chg_plugged_in(the_chip);
+	usb_present = is_usb_chg_plugged_in(the_chip);
+
+	if (dc_present && !usb_present)
+		*source = PM8921_CHG_SRC_DC;
+
+	if (usb_present && !dc_present)
+		*source = PM8921_CHG_SRC_USB;
+
+	if (usb_present && dc_present)
+		*source = PM8921_CHG_SRC_DC;
+
+	return is_charging;
+}
+EXPORT_SYMBOL(pm8921_is_battery_charging);
+
+int pm8921_set_usb_power_supply_type(enum power_supply_type type)
+{
+#if 1  
+	return 0;
+#else
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if (type < POWER_SUPPLY_TYPE_USB)
+		return -EINVAL;
+
+	the_chip->usb_psy.type = type;
+	power_supply_changed(&the_chip->usb_psy);
+	power_supply_changed(&the_chip->dc_psy);
+	return 0;
+#endif
+}
+EXPORT_SYMBOL_GPL(pm8921_set_usb_power_supply_type);
+
+int pm8921_batt_temperature(void)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	return get_prop_batt_temp(the_chip);
+}
+
+static int is_ac_online(void)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	return is_usb_chg_plugged_in(the_chip) &&
+				(pwr_src == HTC_PWR_SOURCE_TYPE_AC ||
+							pwr_src == HTC_PWR_SOURCE_TYPE_9VAC ||
+							pwr_src == HTC_PWR_SOURCE_TYPE_MHL_AC);
+}
+
+static void handle_usb_insertion_removal(struct pm8921_chg_chip *chip)
+{
+	int usb_present, rc = 0;
+	int vbat_programmed = chip->max_voltage_mv;
+
+	if (pm_chg_failed_clear(chip, 1))
+		pr_err("Failed to write CHG_FAILED_CLEAR bit\n");
+	usb_present = is_usb_chg_plugged_in(chip);
+	if (chip->usb_present ^ usb_present) {
+		pr_info("vbus present change: %d -> %d\n",
+		chip->usb_present, usb_present);
+		notify_usb_of_the_plugin_event(usb_present);
+		chip->usb_present = usb_present;
+
+		if (usb_present) {
+			htc_charger_event_notify(HTC_CHARGER_EVENT_VBUS_IN);
+			is_cable_remove = false;
+			schedule_delayed_work(&chip->unplug_check_work,
+				round_jiffies_relative(msecs_to_jiffies
+					(UNPLUG_CHECK_WAIT_PERIOD_MS)));
+		} else {
+			
+			usb_target_ma = 0;
+			pm_chg_disable_auto_enable(chip, 0, BATT_CHG_DISABLED_BIT_EOC);
+			is_batt_full = false;
+			is_ac_safety_timeout = false;
+			htc_charger_event_notify(HTC_CHARGER_EVENT_VBUS_OUT);
+			is_cable_remove = true;
+
+			rc = pm_chg_vddmax_get(chip, &vbat_programmed);
+			if (rc)
+				pr_err("couldnt read vddmax rc = %d\n", rc);
+			pr_info("Set vbatdet=%d after cable out\n",
+					vbat_programmed);
+			rc = pm_chg_vbatdet_set(chip, vbat_programmed);
+			if (rc)
+				pr_err("Failed to set vbatdet=%d rc=%d\n",
+					chip->max_voltage_mv, rc);
+		}
+	}
+	bms_notify_check(chip);
+}
+
+static void handle_stop_ext_usb_chg(struct pm8921_chg_chip *chip)
+{
+	if (chip->ext_usb == NULL) {
+		pr_debug("ext_usb charger not registered.\n");
+		return;
+	}
+
+	if (!chip->ext_usb_charging) {
+		pr_debug("ext_usb charger already not charging.\n");
+		return;
+	}
+
+	if(chip->ext_usb)
+	{
+		if(chip->ext_usb->stop_charging)
+		{
+			chip->ext_usb->stop_charging(chip->ext_usb->ctx);
+			chip->ext_usb_charging = false;
+			chip->ext_usb_charge_done = false;
+		}
+		return;
+	}
+
+}
+
+static void handle_start_ext_usb_chg(struct pm8921_chg_chip *chip)
+{
+	int usb_present;
+	int batt_present;
+	int batt_temp_ok;
+	int vbat_ov;
+	unsigned long delay =
+		round_jiffies_relative(msecs_to_jiffies(EOC_CHECK_PERIOD_MS));
+
+	if (chip->ext_usb == NULL) {
+		pr_debug("ext_usb charger not registered.\n");
+		return;
+	}
+
+	if (chip->ext_usb_charging) {
+		pr_debug("ext_usb charger already charging.\n");
+		return;
+	}
+
+	if(chip->ext_usb)
+	{
+		if(chip->ext_usb->start_charging)
+		{
+			chip->ext_usb->start_charging(chip->ext_usb->ctx);
+			chip->ext_usb_charging = true;
+			chip->ext_usb_charge_done = false;
+
+			
+			if (!flag_disable_wakelock)
+				wake_lock(&chip->eoc_wake_lock);
+			schedule_delayed_work(&chip->eoc_work, delay);
+		}
+		return;
+	}
+
+	usb_present = is_usb_chg_plugged_in(chip);
+	batt_present = pm_chg_get_rt_status(chip, BATT_INSERTED_IRQ);
+	batt_temp_ok = pm_chg_get_rt_status(chip, BAT_TEMP_OK_IRQ);
+	vbat_ov = pm_chg_get_rt_status(chip, VBAT_OV_IRQ);
+
+	if (!usb_present) {
+		pr_warn("%s. usb not present.\n", __func__);
+		return;
+	}
+
+	if (!batt_present) {
+		pr_warn("%s. battery not present.\n", __func__);
+		return;
+	}
+	if (!batt_temp_ok) {
+		pr_warn("%s. battery temperature not ok.\n", __func__);
+		return;
+	}
+	if (vbat_ov) {
+		pr_warn("%s. battery over voltage.\n", __func__);
+		return;
+	}
+
+	chip->ext_usb->start_charging(chip->ext_usb->ctx);
+	chip->ext_usb_charging = true;
+	chip->ext_usb_charge_done = false;
+	
+	schedule_delayed_work(&chip->eoc_work, delay);
+	if (!flag_disable_wakelock)
+		wake_lock(&chip->eoc_wake_lock);
+}
+
+static void handle_stop_ext_chg(struct pm8921_chg_chip *chip)
+{
+	if (chip->ext == NULL) {
+		pr_debug("external charger not registered.\n");
+		return;
+	}
+
+	if (!chip->ext_charging) {
+		pr_debug("already not charging.\n");
+		return;
+	}
+
+	chip->ext->stop_charging(chip->ext->ctx);
+	chip->ext_charging = false;
+	chip->ext_charge_done = false;
+}
+
+static void handle_start_ext_chg(struct pm8921_chg_chip *chip)
+{
+	int dc_present;
+	int batt_present;
+	int batt_temp_ok;
+	int vbat_ov;
+	int batfet;
+	unsigned long delay =
+		round_jiffies_relative(msecs_to_jiffies(EOC_CHECK_PERIOD_MS));
+
+	if (chip->ext == NULL) {
+		pr_debug("external charger not registered.\n");
+		return;
+	}
+
+	if (chip->ext_charging) {
+		pr_debug("already charging.\n");
+		return;
+	}
+
+	dc_present = is_dc_chg_plugged_in(chip);
+	batt_present = pm_chg_get_rt_status(chip, BATT_INSERTED_IRQ);
+	batt_temp_ok = pm_chg_get_rt_status(chip, BAT_TEMP_OK_IRQ);
+	vbat_ov = pm_chg_get_rt_status(chip, VBAT_OV_IRQ);
+	batfet = pm_chg_get_rt_status(chip, BATFET_IRQ);
+
+	if (!dc_present) {
+		pr_warn("%s. dc not present.\n", __func__);
+		return;
+	}
+	if (!batt_present) {
+		pr_warn("%s. battery not present.\n", __func__);
+		return;
+	}
+	if (!batt_temp_ok) {
+		pr_warn("%s. battery temperature not ok.\n", __func__);
+		return;
+	}
+	if (vbat_ov) {
+		pr_warn("%s. battery over voltage.\n", __func__);
+		return;
+	}
+	if (!batfet) {
+		pr_warn("%s. battery FET not closed.\n", __func__);
+		return;
+	}
+
+	chip->ext->start_charging(chip->ext->ctx);
+	chip->ext_charging = true;
+	chip->ext_charge_done = false;
+	
+	schedule_delayed_work(&chip->eoc_work, delay);
+	if (!flag_disable_wakelock)
+		wake_lock(&chip->eoc_wake_lock);
+}
+
+static void handle_dc_removal_insertion(struct pm8921_chg_chip *chip)
+{
+	int dc_present;
+
+	dc_present = is_dc_chg_plugged_in(chip);
+	if (chip->dc_present ^ dc_present) {
+		chip->dc_present = dc_present;
+		
+	}
+	bms_notify_check(chip);
+}
+
+static int pm_chg_turn_off_ovp_fet(struct pm8921_chg_chip *chip, u16 ovptestreg)
+{
+	u8 temp;
+	int err = 0;
+	err = pm8xxx_writeb(chip->dev->parent, ovptestreg, 0x30);
+	if (err) {
+		pr_err("Error %d writing 0x%2x to addr 0x%2x\n",
+				err, 0x30, ovptestreg);
+		return err;
+	}
+	err = pm8xxx_readb(chip->dev->parent, ovptestreg, &temp);
+	if (err) {
+		pr_err("Error %d reading addr 0x%x\n", err, ovptestreg);
+		return err;
+	}
+	
+	temp |= 0x81;
+	err = pm8xxx_writeb(chip->dev->parent, ovptestreg, temp);
+	if (err) {
+		pr_err("Error %d writing 0x%2x to addr 0x%2x\n",
+				err, temp, ovptestreg);
+		return err;
+	}
+	return 0;
+}
+
+static int pm_chg_turn_on_ovp_fet(struct pm8921_chg_chip *chip, u16 ovptestreg)
+{
+	u8 temp;
+	int err = 0;
+
+	err = pm8xxx_writeb(chip->dev->parent, ovptestreg, 0x30);
+	if (err) {
+		pr_err("Error %d writing 0x%2x to addr 0x%2x\n",
+				err, 0x30, ovptestreg);
+		return err;
+	}
+	err = pm8xxx_readb(chip->dev->parent, ovptestreg, &temp);
+	if (err) {
+		pr_err("Error %d reading addr 0x%x\n", err, ovptestreg);
+		return err;
+	}
+	
+	temp &= 0xFE;
+	temp |= 0x80;
+	err = pm8xxx_writeb(chip->dev->parent, ovptestreg, temp);
+	if (err) {
+		pr_err("Error %d writing 0x%2x to addr 0x%2x\n",
+				err, temp, ovptestreg);
+		return err;
+	}
+
+	return 0;
+}
+
+static void turn_off_ovp_fet(struct pm8921_chg_chip *chip, u16 ovptestreg)
+{
+	int i, rc;
+	for (i = 0; i < 5; i++) {
+		rc = pm_chg_turn_off_ovp_fet(chip, ovptestreg);
+		if (!rc)
+			break;
+	}
+	if (i > 0)
+		pr_info("%s: retry = %d\n", __func__, i);
+	return;
+}
+
+static void turn_on_ovp_fet(struct pm8921_chg_chip *chip, u16 ovptestreg)
+{
+	int i, rc;
+	for (i = 0; i < 5; i++) {
+		rc = pm_chg_turn_on_ovp_fet(chip, ovptestreg);
+		if (!rc)
+			break;
+	}
+	if (i > 0)
+		pr_info("%s: retry = %d\n", __func__, i);
+	return;
+}
+
+static int param_open_ovp_counter = 10;
+module_param(param_open_ovp_counter, int, 0644);
+
+#define USB_ACTIVE_BIT BIT(5)
+#define DC_ACTIVE_BIT BIT(6)
+static int is_active_chg_plugged_in(struct pm8921_chg_chip *chip,
+						u8 active_chg_mask)
+{
+	if (active_chg_mask & USB_ACTIVE_BIT)
+		return pm_chg_get_rt_status(chip, USBIN_VALID_IRQ);
+	else if (active_chg_mask & DC_ACTIVE_BIT)
+		return pm_chg_get_rt_status(chip, DCIN_VALID_IRQ);
+	else
+		return 0;
+}
+
+#define WRITE_BANK_4		0xC0
+#define OVP_DEBOUNCE_TIME 0x06
+static void unplug_ovp_fet_open_worker(struct work_struct *work)
+{
+	struct pm8921_chg_chip *chip = container_of(work,
+				struct pm8921_chg_chip,
+				unplug_ovp_fet_open_work);
+	int chg_gone = 0, active_chg_plugged_in = 0, count = 0;
+	u8 active_mask = 0;
+	u16 ovpreg, ovptestreg;
+
+	wake_lock(&chip->unplug_ovp_fet_open_wake_lock);
+	pr_info("%s:Start\n", __func__);
+	if (is_usb_chg_plugged_in(chip) &&
+		(chip->active_path & USB_ACTIVE_BIT)) {
+		ovpreg = USB_OVP_CONTROL;
+		ovptestreg = USB_OVP_TEST;
+		active_mask = USB_ACTIVE_BIT;
+	} else if (is_dc_chg_plugged_in(chip) &&
+		(chip->active_path & DC_ACTIVE_BIT)) {
+		ovpreg = DC_OVP_CONTROL;
+		ovptestreg = DC_OVP_TEST;
+		active_mask = DC_ACTIVE_BIT;
+	} else {
+		goto finish_due_to_no_cable;
+	}
+
+	while (count++ < param_open_ovp_counter) {
+		pm_chg_masked_write(chip, ovpreg, OVP_DEBOUNCE_TIME, 0x0);
+		usleep(10);
+		active_chg_plugged_in = is_active_chg_plugged_in(chip, active_mask);
+		chg_gone = pm_chg_get_rt_status(chip, CHG_GONE_IRQ);
+		pr_debug("OVP FET count=%d chg_gone=%d, active_valid=%d\n",
+					count, chg_gone, active_chg_plugged_in);
+		
+		if (chg_gone == 1 && active_chg_plugged_in == 1) {
+			pr_debug("since chg_gone = 1 disabling ovp_fet for 20 msecs\n");
+			turn_off_ovp_fet(chip, ovptestreg);
+
+			msleep(20);
+
+			turn_on_ovp_fet(chip, ovptestreg);
+		} else {
+			
+			break;
+		}
+	}
+	pm_chg_masked_write(chip, ovpreg, OVP_DEBOUNCE_TIME, 0x2);
+finish_due_to_no_cable:
+	pr_info("%s:Exiting,count=%d,chg_gone=%d,active_valid=%d\n",
+				__func__, count, chg_gone, active_chg_plugged_in);
+	wake_unlock(&chip->unplug_ovp_fet_open_wake_lock);
+	return;
+}
+
+static int find_usb_ma_value(int value)
+{
+	int i;
+
+	for (i = ARRAY_SIZE(usb_ma_table) - 1; i >= 0; i--) {
+		if (value >= usb_ma_table[i].usb_ma)
+			break;
+	}
+
+	return i;
+}
+
+static void decrease_usb_ma_value(int *value)
+{
+	int i;
+
+	if (value) {
+		i = find_usb_ma_value(*value);
+		if (i > 0)
+			i--;
+		*value = usb_ma_table[i].usb_ma;
+	}
+}
+
+static void increase_usb_ma_value(int *value)
+{
+	int i;
+
+	if (value) {
+		i = find_usb_ma_value(*value);
+
+		if (i < (ARRAY_SIZE(usb_ma_table) - 1))
+			i++;
+		*value = usb_ma_table[i].usb_ma;
+	}
+}
+
+static void vin_collapse_check_worker(struct work_struct *work)
+{
+	struct delayed_work *dwork = to_delayed_work(work);
+	struct pm8921_chg_chip *chip = container_of(dwork,
+			struct pm8921_chg_chip, vin_collapse_check_work);
+
+	
+	if (is_usb_chg_plugged_in(chip) &&
+		usb_target_ma > USB_WALL_THRESHOLD_MA) {
+		
+		decrease_usb_ma_value(&usb_target_ma);
+		
+		__pm8921_charger_vbus_draw(USB_WALL_THRESHOLD_MA);
+		pr_debug("usb_now=%d, usb_target = %d\n",
+				USB_WALL_THRESHOLD_MA, usb_target_ma);
+	} else {
+		cable_detection_vbus_irq_handler();
+	}
+}
+
+#define VIN_MIN_COLLAPSE_CHECK_MS	50
+static irqreturn_t usbin_valid_irq_handler(int irq, void *data)
+{
+	pr_info("%s: usb_target_ma=%d\n", __func__, usb_target_ma);
+	if (usb_target_ma) {
+		schedule_delayed_work(&the_chip->vin_collapse_check_work,
+				      round_jiffies_relative(msecs_to_jiffies
+						(VIN_MIN_COLLAPSE_CHECK_MS)));
+	} else {
+		
+		cable_detection_vbus_irq_handler();
+	}
+
+	if (0)
+		handle_usb_insertion_removal(data);
+	return IRQ_HANDLED;
+}
+
+static void update_ovp_uvp_state(int ov, int v, int uv)
+{
+	if ( ov && !v && !uv) {
+		if (!ovp) {
+			ovp = 1;
+			pr_info("OVP: 0 -> 1, USB_Valid: %d\n", v);
+			htc_charger_event_notify(HTC_CHARGER_EVENT_OVP);
+		}
+	} else if ( !ov && !v && uv) {
+		if (!uvp) {
+			uvp = 1;
+			pr_info("UVP: 0 -> 1, USB_Valid: %d\n", v);
+		}
+	} else {
+		if (ovp) {
+			ovp = 0;
+			pr_info("OVP: 1 -> 0, USB_Valid: %d\n", v);
+			htc_charger_event_notify(HTC_CHARGER_EVENT_OVP_RESOLVE);
+		}
+		if (uvp) {
+			uvp = 0;
+			pr_info("UVP: 1 -> 0, USB_Valid: %d\n", v);
+		}
+	}
+}
+
+static irqreturn_t usbin_ov_irq_handler(int irq, void *data)
+{
+	int ov, uv, v;
+	ov = pm_chg_get_rt_status(the_chip, USBIN_OV_IRQ);
+	v = pm_chg_get_rt_status(the_chip, USBIN_VALID_IRQ);
+	uv = pm_chg_get_rt_status(the_chip, USBIN_UV_IRQ);
+	pr_debug("%d -> %d [%d,%d,%d]\n",
+					usbin_ov_irq_state, ov, ov, v, uv);
+	usbin_ov_irq_state = ov;
+	update_ovp_uvp_state(ov, v, uv);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t batt_inserted_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+	int status;
+
+	status = pm_chg_get_rt_status(chip, BATT_INSERTED_IRQ);
+	schedule_work(&chip->battery_id_valid_work);
+	handle_start_ext_chg(chip);
+	handle_start_ext_usb_chg(chip);
+	pr_debug("battery present=%d", status);
+	
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t vbatdet_low_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+	int high_transition, rc = 0;
+
+
+	high_transition = pm_chg_get_rt_status(chip, VBATDET_LOW_IRQ);
+
+	if(chip->ext_usb)
+	{
+		if (high_transition)
+		{
+			queue_delayed_work(ext_charger_wq, &ext_charger_vbat_low_task, 0);
+		}
+
+		pr_info("%s, high_transition:%d\n", __func__, high_transition);
+		return IRQ_HANDLED;
+	}
+
+	if (high_transition) {
+		handle_start_ext_usb_chg(chip);
+		
+		pr_info("%s: Set vbatdet=%d before recharge is started\n",
+				__func__, PM8921_CHG_VBATDET_MAX);
+		rc = pm_chg_vbatdet_set(chip, PM8921_CHG_VBATDET_MAX);
+		if (rc)
+			pr_err("Failed to set vbatdet=%d rc=%d\n",
+					PM8921_CHG_VBATDET_MAX, rc);
+		
+		pm_chg_disable_auto_enable(chip, 0, BATT_CHG_DISABLED_BIT_EOC);
+		pr_info("batt fell below resume voltage %s\n",
+			batt_charging_disabled ? "" : "charger enabled (recharging)");
+	} else {
+		pr_info("vbatdet_low = %d, fsm_state=%d\n", high_transition,
+			pm_chg_get_fsm_state(data));
+	}
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t usbin_uv_irq_handler(int irq, void *data)
+{
+	int ov, uv, v;
+	ov = pm_chg_get_rt_status(the_chip, USBIN_OV_IRQ);
+	v = pm_chg_get_rt_status(the_chip, USBIN_VALID_IRQ);
+	uv = pm_chg_get_rt_status(the_chip, USBIN_UV_IRQ);
+	pr_debug("%d -> %d [%d,%d,%d]\n",
+					usbin_uv_irq_state, uv, ov, v, uv);
+	usbin_uv_irq_state = uv;
+	update_ovp_uvp_state(ov, v, uv);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t vbat_ov_irq_handler(int irq, void *data)
+{
+	pr_debug("fsm_state=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t chgwdog_irq_handler(int irq, void *data)
+{
+	pr_debug("fsm_state=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t vcp_irq_handler(int irq, void *data)
+{
+	pr_debug("state_changed_to=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t atcdone_irq_handler(int irq, void *data)
+{
+	pr_debug("fsm_state=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t atcfail_irq_handler(int irq, void *data)
+{
+	pr_debug("fsm_state=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t chgdone_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+
+	pr_debug("state_changed_to=%d\n", pm_chg_get_fsm_state(data));
+
+
+	if(chip->ext_usb)
+	{
+		queue_delayed_work(ext_charger_wq, &ext_charger_chgdone_task, 0);
+		return IRQ_HANDLED;
+	}
+
+	handle_stop_ext_usb_chg(chip);
+	handle_stop_ext_chg(chip);
+
+
+	bms_notify_check(chip);
+	htc_gauge_event_notify(HTC_GAUGE_EVENT_EOC);
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t chgfail_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+	int ret;
+
+	if (!is_ac_online() || flag_keep_charge_on || flag_pa_recharge) {
+		pr_info("%s: write CHG_FAILED_CLEAR bit\n", __func__);
+		ret = pm_chg_failed_clear(chip, 1);
+		if (ret)
+			pr_err("Failed to write CHG_FAILED_CLEAR bit\n");
+	} else {
+		if ((chip->safety_time > SAFETY_TIME_MAX_LIMIT) &&
+				!is_ac_safety_timeout_twice) {
+			is_ac_safety_timeout_twice = true;
+			pr_info("%s: write CHG_FAILED_CLEAR bit "
+					"due to safety time is twice\n", __func__);
+			ret = pm_chg_failed_clear(chip, 1);
+			if (ret)
+				pr_err("Failed to write CHG_FAILED_CLEAR bit\n");
+		} else {
+			is_ac_safety_timeout = true;
+			pr_err("%s: batt_present=%d, batt_temp_ok=%d, state_changed_to=%d\n",
+					__func__, get_prop_batt_present(chip),
+					pm_chg_get_rt_status(chip, BAT_TEMP_OK_IRQ),
+					pm_chg_get_fsm_state(data));
+		}
+	}
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t chgstate_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+
+	pr_debug("state_changed_to=%d\n", pm_chg_get_fsm_state(data));
+	bms_notify_check(chip);
+
+	return IRQ_HANDLED;
+}
+
+static int param_vin_disable_counter = 5;
+module_param(param_vin_disable_counter, int, 0644);
+
+static void attempt_reverse_boost_fix(struct pm8921_chg_chip *chip,
+							int count, int usb_ma)
+{
+	if (usb_ma)
+		__pm8921_charger_vbus_draw(500);
+	pr_debug(" count = %d iusb=500mA\n", count);
+	disable_input_voltage_regulation(chip);
+	pr_debug(" count = %d disable_input_regulation\n", count);
+
+	msleep(20);
+
+	pr_debug(" count = %d end sleep 20ms chg_gone=%d, usb_valid = %d\n",
+								count,
+								pm_chg_get_rt_status(chip, CHG_GONE_IRQ),
+								is_usb_chg_plugged_in(chip));
+	pr_debug(" count = %d restoring input regulation and usb_ma = %d\n",
+								count, usb_ma);
+	enable_input_voltage_regulation(chip);
+	if (usb_ma)
+		__pm8921_charger_vbus_draw(usb_ma);
+}
+
+#define VIN_ACTIVE_BIT BIT(0)
+#define UNPLUG_WRKARND_RESTORE_WAIT_PERIOD_US 200
+#define VIN_MIN_INCREASE_MV 100
+#define CONSECUTIVE_TRIAL_COUNT_MAX	(20)
+static void unplug_check_worker(struct work_struct *work)
+{
+	struct delayed_work *dwork = to_delayed_work(work);
+	struct pm8921_chg_chip *chip = container_of(dwork,
+				struct pm8921_chg_chip, unplug_check_work);
+	u8 reg_loop, active_path;
+	int rc, ibat, active_chg_plugged_in, usb_ma;
+	int chg_gone = 0;
+	static int rb_trial_count = 0;
+	static int ovp_trial_count = 0;
+
+	reg_loop = 0;
+	rc = pm8xxx_readb(chip->dev->parent, PBL_ACCESS1, &active_path);
+	if (rc) {
+		pr_err("Failed to read PBL_ACCESS1 rc=%d\n", rc);
+		return;
+	}
+	chip->active_path = active_path;
+
+	active_chg_plugged_in = is_active_chg_plugged_in(chip, active_path);
+	pr_debug("active_path = 0x%x, active_chg_plugged_in = %d\n",
+			active_path, active_chg_plugged_in);
+	if (active_path & USB_ACTIVE_BIT) {
+		pr_debug("USB charger active\n");
+
+		pm_chg_iusbmax_get(chip, &usb_ma);
+		#if 0
+		if (usb_ma == 500 && !usb_target_ma) {
+			pr_info("Stopping Unplug Check Worker USB == 500mA\n");
+			rb_trial_count = ovp_trial_count = 0;
+			disable_input_voltage_regulation(chip);
+			return;
+		}
+		#endif
+
+		if (usb_ma <= 100) {
+			pr_info(
+				"Unenumerated or suspended usb_ma = %d skip\n",
+				usb_ma);
+			goto check_again_later;
+		}
+	} else if (active_path & DC_ACTIVE_BIT) {
+		pr_debug("DC charger active\n");
+		if (!chip->dc_unplug_check)
+			return;
+	} else {
+		
+		if (!(is_usb_chg_plugged_in(chip))
+				&& !(is_dc_chg_plugged_in(chip))) {
+			pr_info("Stopping Unplug Check - chargers are removed"
+				"reg_loop = %d, fsm = %d ibat = %d "
+				"(rb_trial_count=%d ovp_trial_count=%d)\n",
+				pm_chg_get_regulation_loop(chip),
+				pm_chg_get_fsm_state(chip),
+				get_prop_batt_current(chip),
+				rb_trial_count,
+				ovp_trial_count
+				);
+			rb_trial_count = ovp_trial_count = 0;
+		}
+		return;
+	}
+
+	if (active_path & USB_ACTIVE_BIT) {
+		reg_loop = pm_chg_get_regulation_loop(chip);
+		pr_debug("reg_loop=0x%x usb_ma = %d\n", reg_loop, usb_ma);
+		if ((reg_loop & VIN_ACTIVE_BIT) &&
+			(usb_ma > USB_WALL_THRESHOLD_MA)) {
+			decrease_usb_ma_value(&usb_ma);
+			usb_target_ma = usb_ma;
+			
+			__pm8921_charger_vbus_draw(usb_ma);
+			pr_debug("usb_now=%d, usb_target = %d\n",
+				usb_ma, usb_target_ma);
+		}
+	}
+
+	reg_loop = pm_chg_get_regulation_loop(chip);
+#if 0
+	pr_debug("reg_loop=0x%x usb_ma = %d\n", reg_loop, usb_ma);
+#endif
+
+	ibat = get_prop_batt_current(chip);
+	if (reg_loop & VIN_ACTIVE_BIT) {
+
+		pr_debug("ibat = %d fsm = %d reg_loop = 0x%x\n",
+				ibat, pm_chg_get_fsm_state(chip), reg_loop);
+		if (ibat > 0) {
+			int count = 0;
+			while (count++ < param_vin_disable_counter
+					&& active_chg_plugged_in == 1) {
+				if (active_path & USB_ACTIVE_BIT)
+					attempt_reverse_boost_fix(chip,
+								count, usb_ma);
+				else
+					attempt_reverse_boost_fix(chip,
+								count, 0);
+				active_chg_plugged_in
+					= is_active_chg_plugged_in(chip,
+						active_path);
+				pr_debug("active_chg_plugged_in = %d\n",
+						active_chg_plugged_in);
+				if(!active_chg_plugged_in)
+					pr_info("%s: cable out by vin disable, count:%d\n",
+							__func__, count);
+			}
+			rb_trial_count++;
+			if (rb_trial_count > CONSECUTIVE_TRIAL_COUNT_MAX) {
+				pr_info("too much rb_trial_count=%d\n", rb_trial_count);
+				rb_trial_count = 0;
+			}
+		}
+	}
+
+	active_chg_plugged_in = is_active_chg_plugged_in(chip, active_path);
+	pr_debug("active_path = 0x%x, active_chg = %d\n",
+			active_path, active_chg_plugged_in);
+	chg_gone = pm_chg_get_rt_status(chip, CHG_GONE_IRQ);
+
+	if (chg_gone == 1 && active_chg_plugged_in == 1) {
+		pr_debug("chg_gone=%d, active_chg_plugged_in = %d\n",
+					chg_gone, active_chg_plugged_in);
+		ovp_trial_count++;
+		if (ovp_trial_count > CONSECUTIVE_TRIAL_COUNT_MAX) {
+			pr_info("too much ovp_trial_count=%d\n", ovp_trial_count);
+			ovp_trial_count = 0;
+		}
+		schedule_work(&chip->unplug_ovp_fet_open_work);
+	}
+
+	if (!(reg_loop & VIN_ACTIVE_BIT) && (active_path & USB_ACTIVE_BIT) &&
+			(usb_target_ma > USB_WALL_THRESHOLD_MA)) {
+		
+		if (usb_ma < usb_target_ma) {
+			increase_usb_ma_value(&usb_ma);
+			__pm8921_charger_vbus_draw(usb_ma);
+			pr_debug("usb_now=%d, usb_target = %d\n",
+					usb_ma, usb_target_ma);
+		} else {
+			usb_target_ma = usb_ma;
+		}
+	}
+
+check_again_later:
+	
+	schedule_delayed_work(&chip->unplug_check_work,
+		      round_jiffies_relative(msecs_to_jiffies
+				(UNPLUG_CHECK_WAIT_PERIOD_MS)));
+}
+
+static irqreturn_t loop_change_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+
+	pr_info("fsm_state=%d reg_loop=0x%x\n",
+		pm_chg_get_fsm_state(data),
+		pm_chg_get_regulation_loop(data));
+
+	schedule_delayed_work(&chip->unplug_check_work,
+		round_jiffies_relative(msecs_to_jiffies(0)));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t fastchg_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+	int high_transition;
+
+	high_transition = pm_chg_get_rt_status(chip, FASTCHG_IRQ);
+	if (high_transition && !delayed_work_pending(&chip->eoc_work)) {
+		if (!flag_disable_wakelock)
+			wake_lock(&chip->eoc_wake_lock);
+		schedule_delayed_work(&chip->eoc_work,
+				      round_jiffies_relative(msecs_to_jiffies
+							(EOC_CHECK_PERIOD_MS)));
+	}
+	bms_notify_check(chip);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t trklchg_irq_handler(int irq, void *data)
+{
+	
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t batt_removed_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+	int status;
+
+	status = pm_chg_get_rt_status(chip, BATT_REMOVED_IRQ);
+	if (chip->is_embeded_batt) {
+		pr_info("%s: Skip it due to embeded battery, present=%d\n",
+					__func__, !status);
+		return IRQ_HANDLED;
+	}
+	if (chip->mbat_in_gpio
+			&& (gpio_get_value(chip->mbat_in_gpio) == 0)) {
+		pr_info("%s: Battery is still existed, present=%d\n",
+					__func__, !status);
+		return IRQ_HANDLED;
+	}
+	pr_info("%s: battery present=%d FSM=%d", __func__, !status,
+					 pm_chg_get_fsm_state(data));
+	handle_stop_ext_usb_chg(chip);
+	handle_stop_ext_chg(chip);
+	
+	if (status)
+		htc_gauge_event_notify(HTC_GAUGE_EVENT_BATT_REMOVED);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t batttemp_hot_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+	pr_info("Battery hot\n");
+
+	pr_debug("Batt hot fsm_state=%d\n", pm_chg_get_fsm_state(data));
+
+	handle_stop_ext_chg(chip);
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t chghot_irq_handler(int irq, void *data)
+{
+	pr_debug("Chg hot fsm_state=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t batttemp_cold_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+	pr_info("Battery cold\n");
+
+	pr_debug("Batt cold fsm_state=%d\n", pm_chg_get_fsm_state(data));
+
+	handle_stop_ext_chg(chip);
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t chg_gone_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+	u8 reg;
+	int rc, chg_gone, usb_chg_plugged_in, dc_chg_plugged_in;
+
+	usb_chg_plugged_in = is_usb_chg_plugged_in(chip);
+	dc_chg_plugged_in = is_dc_chg_plugged_in(chip);
+	chg_gone = pm_chg_get_rt_status(chip, CHG_GONE_IRQ);
+
+	pr_info("chg_gone=%d, usb_valid=%d, dc_valid=%d, fsm=%d\n",
+			chg_gone, usb_chg_plugged_in, dc_chg_plugged_in,
+			pm_chg_get_fsm_state(data));
+	rc = pm8xxx_readb(chip->dev->parent, CHG_CNTRL_3, &reg);
+	if (rc)
+		pr_err("Failed to read CHG_CNTRL_3 rc=%d\n", rc);
+
+	if (reg & CHG_USB_SUSPEND_BIT)
+		return IRQ_HANDLED;
+	schedule_work(&chip->unplug_ovp_fet_open_work);
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t bat_temp_ok_irq_handler(int irq, void *data)
+{
+	int bat_temp_ok;
+	struct pm8921_chg_chip *chip = data;
+
+	
+	if(the_chip->ext_usb)
+	{
+		pr_info("%s\n", __func__);
+		queue_delayed_work(ext_charger_wq, &ext_charger_temp_task, HZ/200);
+		return IRQ_HANDLED;
+	}
+
+	bat_temp_ok = pm_chg_get_rt_status(chip, BAT_TEMP_OK_IRQ);
+	if (bat_temp_ok_prev == bat_temp_ok) {
+		pr_info("batt_temp_ok=%d same as previous one so skip it this time\n",
+				 bat_temp_ok);
+		return IRQ_HANDLED;
+	} else {
+		pr_info("batt_temp_ok=%d, bat_temp_ok_prev=%d, FSM=%d\n",
+				 bat_temp_ok, bat_temp_ok_prev, pm_chg_get_fsm_state(data));
+		bat_temp_ok_prev = bat_temp_ok;
+	}
+
+	if (bat_temp_ok) {
+		handle_start_ext_chg(chip);
+	} else {
+		handle_stop_ext_chg(chip);
+	}
+
+	bms_notify_check(chip);
+
+	htc_gauge_event_notify(HTC_GAUGE_EVENT_TEMP_ZONE_CHANGE);
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t coarse_det_low_irq_handler(int irq, void *data)
+{
+	pr_debug("fsm_state=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t vdd_loop_irq_handler(int irq, void *data)
+{
+	pr_debug("fsm_state=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t vreg_ov_irq_handler(int irq, void *data)
+{
+	pr_debug("fsm_state=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t vbatdet_irq_handler(int irq, void *data)
+{
+	pr_debug("fsm_state=%d\n", pm_chg_get_fsm_state(data));
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t batfet_irq_handler(int irq, void *data)
+{
+	pr_debug("vreg ov\n");
+	
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t dcin_valid_irq_handler(int irq, void *data)
+{
+#if 1
+	pr_info("%s\n", __func__);
+	cable_detection_vbus_irq_handler();
+#else
+	struct pm8921_chg_chip *chip = data;
+
+	pm8921_disable_source_current(true); 
+
+	handle_dc_removal_insertion(chip);
+	handle_start_ext_chg(chip);
+#endif
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t dcin_ov_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+
+	pm8921_disable_source_current(false); 
+
+	handle_dc_removal_insertion(chip);
+	handle_stop_ext_chg(chip);
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t dcin_uv_irq_handler(int irq, void *data)
+{
+	struct pm8921_chg_chip *chip = data;
+
+	pm8921_disable_source_current(false); 
+	handle_stop_ext_chg(chip);
+
+	return IRQ_HANDLED;
+}
+
+static void dump_irq_rt_status(void)
+{
+	pr_info("[irq1] %d%d%d%d %d%d%d%d %d%d%d%d %d%d%d\n",
+		
+		pm_chg_get_rt_status(the_chip, USBIN_VALID_IRQ),
+		pm_chg_get_rt_status(the_chip, USBIN_OV_IRQ),
+		pm_chg_get_rt_status(the_chip, USBIN_UV_IRQ),
+		pm_chg_get_rt_status(the_chip, VBAT_OV_IRQ),
+		
+		pm_chg_get_rt_status(the_chip, BATT_INSERTED_IRQ),
+		pm_chg_get_rt_status(the_chip, BATT_REMOVED_IRQ),
+		pm_chg_get_rt_status(the_chip, VBATDET_LOW_IRQ),
+		pm_chg_get_rt_status(the_chip, VBATDET_IRQ),
+		
+		pm_chg_get_rt_status(the_chip, ATCDONE_IRQ),
+		pm_chg_get_rt_status(the_chip, ATCFAIL_IRQ),
+		pm_chg_get_rt_status(the_chip, CHGDONE_IRQ),
+		pm_chg_get_rt_status(the_chip, CHGFAIL_IRQ),
+		
+		pm_chg_get_rt_status(the_chip, FASTCHG_IRQ),
+		pm_chg_get_rt_status(the_chip, TRKLCHG_IRQ),
+		pm_chg_get_rt_status(the_chip, VCP_IRQ));
+	pr_info("[irq2] %d%d%d%d %d%d%d%d %d%d%d%d %d%d%d\n",
+		
+		pm_chg_get_rt_status(the_chip, BATTTEMP_HOT_IRQ),
+		pm_chg_get_rt_status(the_chip, BATTTEMP_COLD_IRQ),
+		pm_chg_get_rt_status(the_chip, BAT_TEMP_OK_IRQ),
+		pm_chg_get_rt_status(the_chip, BATFET_IRQ),
+		
+		pm_chg_get_rt_status(the_chip, CHGHOT_IRQ),
+		pm_chg_get_rt_status(the_chip, CHG_GONE_IRQ),
+		pm_chg_get_rt_status(the_chip, CHGSTATE_IRQ),
+		pm_chg_get_rt_status(the_chip, CHGWDOG_IRQ),
+		
+		pm_chg_get_rt_status(the_chip, VDD_LOOP_IRQ),
+		pm_chg_get_rt_status(the_chip, VREG_OV_IRQ),
+		pm_chg_get_rt_status(the_chip, COARSE_DET_LOW_IRQ),
+		pm_chg_get_rt_status(the_chip, LOOP_CHANGE_IRQ),
+		
+		
+		pm_chg_get_rt_status(the_chip, DCIN_VALID_IRQ),
+		pm_chg_get_rt_status(the_chip, DCIN_OV_IRQ),
+		pm_chg_get_rt_status(the_chip, DCIN_UV_IRQ));
+}
+
+static void dump_reg(void)
+{
+	u64 val;
+
+	get_reg((void *)CHG_CNTRL, &val);
+	pr_info("CHG_CNTRL = 0x%llx\n", val);
+	get_reg((void *)CHG_CNTRL_2, &val);
+	pr_info("CHG_CNTRL_2 = 0x%llx\n", val);
+	get_reg((void *)CHG_CNTRL_3, &val);
+	pr_info("CHG_CNTRL_3 = 0x%llx\n", val);
+	get_reg((void *)PBL_ACCESS1, &val);
+	pr_info("PBL_ACCESS1 = 0x%llx\n", val);
+	get_reg((void *)PBL_ACCESS2, &val);
+	pr_info("PBL_ACCESS2 = 0x%llx\n", val);
+	get_reg((void *)SYS_CONFIG_1, &val);
+	pr_info("SYS_CONFIG_1 = 0x%llx\n", val);
+	get_reg((void *)SYS_CONFIG_2, &val);
+	pr_info("SYS_CONFIG_2 = 0x%llx\n", val);
+	get_reg((void *)CHG_IBAT_SAFE, &val);
+	pr_info("CHG_IBAT_SAFE = 0x%llx\n", val);
+	get_reg((void *)CHG_IBAT_MAX, &val);
+	pr_info("CHG_IBAT_MAX = 0x%llx\n", val);
+	get_reg((void *)CHG_VBAT_DET, &val);
+	pr_info("CHG_VBAT_DET = 0x%llx\n", val);
+	get_reg((void *)CHG_VDD_SAFE, &val);
+	pr_info("CHG_VDD_SAFE = 0x%llx\n", val);
+	get_reg((void *)CHG_VDD_MAX, &val);
+	pr_info("CHG_VDD_MAX = 0x%llx\n", val);
+	get_reg((void *)CHG_VIN_MIN, &val);
+	pr_info("CHG_VIN_MIN = 0x%llx\n", val);
+	get_reg((void *)CHG_VTRICKLE, &val);
+	pr_info("CHG_VTRICKLE = 0x%llx\n", val);
+	get_reg((void *)CHG_ITRICKLE, &val);
+	pr_info("CHG_ITRICKLE = 0x%llx\n", val);
+	get_reg((void *)CHG_ITERM, &val);
+	pr_info("CHG_ITERM = 0x%llx\n", val);
+	get_reg((void *)CHG_TCHG_MAX, &val);
+	pr_info("CHG_TCHG_MAX = 0x%llx\n", val);
+	get_reg((void *)CHG_TWDOG, &val);
+	pr_info("CHG_TWDOG = 0x%llx\n", val);
+	get_reg((void *)CHG_TEMP_THRESH, &val);
+	pr_info("CHG_TEMP_THRESH = 0x%llx\n", val);
+	get_reg((void *)CHG_COMP_OVR, &val);
+	pr_info("CHG_COMP_OVR = 0x%llx\n", val);
+	get_reg((void *)CHG_BUCK_CTRL_TEST1, &val);
+	pr_info("CHG_BUCK_CTRL_TEST1 = 0x%llx\n", val);
+	get_reg((void *)CHG_BUCK_CTRL_TEST2, &val);
+	pr_info("CHG_BUCK_CTRL_TEST2 = 0x%llx\n", val);
+	get_reg((void *)CHG_BUCK_CTRL_TEST3, &val);
+	pr_info("CHG_BUCK_CTRL_TEST3 = 0x%llx\n", val);
+	get_reg((void *)CHG_TEST, &val);
+	pr_info("CHG_TEST = 0x%llx\n", val);
+	get_reg((void *)USB_OVP_CONTROL, &val);
+	pr_info("USB_OVP_CONTROL = 0x%llx\n", val);
+	get_reg((void *)USB_OVP_TEST, &val);
+	pr_info("USB_OVP_TEST = 0x%llx\n", val);
+	get_reg((void *)DC_OVP_CONTROL, &val);
+	pr_info("DC_OVP_CONTROL = 0x%llx\n", val);
+	get_reg((void *)DC_OVP_TEST, &val);
+	pr_info("DC_OVP_TEST = 0x%llx\n", val);
+
+	get_reg_loop((void *)NULL, &val);
+	pr_info("REGULATION_LOOP_CONTROL = 0x%llx\n", val);
+}
+
+static void dump_all(int more)
+{
+	int rc;
+	struct pm8xxx_adc_chan_result result;
+	int vbat_mv, ibat_ma, tbat_deg, soc, id_mv, iusb_ma;
+	int fcc, health, present, charger_type, status;
+	int fsm, ac_online, usb_online, dc_online;
+	int ichg = 0, vph_pwr = 0, usbin = 0;
+	int temp_fault = 0, vbatdet_low = 0;
+	vbat_mv = get_prop_battery_uvolts(the_chip)/1000;
+	soc = get_prop_batt_capacity(the_chip);
+	ibat_ma = get_prop_batt_current(the_chip)/1000;
+	fcc = get_prop_batt_fcc(the_chip);
+	id_mv = (int)read_battery_id(the_chip)/1000;
+	health = get_prop_batt_health(the_chip);
+	present = get_prop_batt_present(the_chip);
+	charger_type = get_prop_charge_type(the_chip);
+	status = get_prop_batt_status(the_chip);
+	tbat_deg = get_prop_batt_temp(the_chip)/10;
+	if (tbat_deg >= 68)
+		pr_warn("battery temperature=%d >= 68\n", tbat_deg);
+
+	fsm = pm_chg_get_fsm_state(the_chip);
+	ac_online = is_ac_online();
+	usb_online = is_usb_chg_plugged_in(the_chip);
+	dc_online = is_dc_chg_plugged_in(the_chip);
+	pm8921_is_batt_temperature_fault(&temp_fault);
+	pm_chg_iusbmax_get(the_chip, &iusb_ma);
+
+	rc = pm8xxx_adc_read(CHANNEL_ICHG, &result);
+	if (rc) {
+		pr_err("error reading i_chg channel = %d, rc = %d\n",
+					CHANNEL_ICHG, rc);
+	}
+	ichg = (int)result.physical;
+
+	rc = pm8xxx_adc_read(CHANNEL_VPH_PWR, &result);
+	if (rc) {
+		pr_err("error reading vph_pwr channel = %d, rc = %d\n",
+					CHANNEL_VPH_PWR, rc);
+	}
+	vph_pwr = (int)result.physical;
+
+	rc = pm8xxx_adc_read(CHANNEL_USBIN, &result);
+	if (rc) {
+		pr_err("error reading i_chg channel = %d, rc = %d\n",
+					CHANNEL_USBIN, rc);
+	}
+	usbin = (int)result.physical;
+	vbatdet_low = pm_chg_get_rt_status(the_chip, VBATDET_LOW_IRQ);
+
+	pr_info("V=%d mV, I=%d mA, T=%d C, SoC=%d%%, FCC=%d, id=%d mV,"
+			" H=%d, P=%d, CHG=%d, S=%d, FSM=%d, AC=%d, USB=%d, DC=%d,"
+			" iusb_ma=%d, usb_target_ma=%d, OVP=%d, UVP=%d, TM=%d, eoc_count=%d,"
+			" vbatdet_low=%d, is_ac_ST=%d, batfet_dis=0x%x, pwrsrc_dis=0x%x,"
+			" is_full=%d, temp_fault=%d, is_bat_warm/cool=%d/%d,"
+			" btm_warm/cool=%d/%d, ichg=%d uA, vph_pwr=%d uV, usbin=%d uV,"
+			" flag=%d%d%d%d\n",
+			vbat_mv, ibat_ma, tbat_deg, soc, fcc, id_mv,
+			health, present, charger_type, status, fsm,
+			ac_online, usb_online, dc_online,
+			iusb_ma, usb_target_ma, ovp, uvp, thermal_mitigation, eoc_count,
+			vbatdet_low, is_ac_safety_timeout, batt_charging_disabled,
+			pwrsrc_disabled, is_batt_full,
+			temp_fault, the_chip->is_bat_warm, the_chip->is_bat_cool,
+			pm8xxx_adc_btm_is_warm(), pm8xxx_adc_btm_is_cool(),
+			ichg, vph_pwr, usbin, test_power_monitor, flag_keep_charge_on,
+			flag_pa_recharge, flag_disable_wakelock);
+	
+	if (more || (fsm == FSM_STATE_OFF_0) || (ibat_ma < -1000) ||
+			(tbat_deg == 80) || (4000 < usbin && (!usb_online)) ||
+			(2000 < ibat_ma) || is_cable_remove ||
+			(0 < ibat_ma && fsm == FSM_STATE_FAST_CHG_7) ||
+			(!is_batt_full && usb_online && fsm != FSM_STATE_FAST_CHG_7)) {
+		dump_irq_rt_status();
+		dump_reg();
+		pm8921_bms_dump_all();
+		is_cable_remove = false;
+	}
+}
+
+inline int pm8921_dump_all(void)
+{
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+	dump_all(0);
+
+	if(the_chip->ext_usb)
+	{
+		if(the_chip->ext_usb->ichg->dump_all)
+			the_chip->ext_usb->ichg->dump_all();
+	}
+
+	return 0;
+}
+
+static void update_heartbeat(struct work_struct *work)
+{
+	struct delayed_work *dwork = to_delayed_work(work);
+	struct pm8921_chg_chip *chip = container_of(dwork,
+				struct pm8921_chg_chip, update_heartbeat_work);
+
+	pm_chg_failed_clear(chip, 1);
+	
+	schedule_delayed_work(&chip->update_heartbeat_work,
+			      round_jiffies_relative(msecs_to_jiffies
+						     (chip->update_time)));
+	dump_all(0);
+}
+
+static void recharge_check_worker(struct work_struct *work)
+{
+	struct delayed_work *dwork = to_delayed_work(work);
+	struct pm8921_chg_chip *chip = container_of(dwork,
+				struct pm8921_chg_chip, recharge_check_work);
+	int fast_chg;
+
+	fast_chg = pm_chg_get_rt_status(chip, FASTCHG_IRQ);
+	if (!fast_chg) {
+		pr_info("check vbatdet_low_irq rt status\n");
+		vbatdet_low_irq_handler(chip->pmic_chg_irq[VBATDET_LOW_IRQ], chip);
+	}
+	wake_unlock(&chip->recharge_check_wake_lock);
+}
+
+enum {
+	CHG_IN_PROGRESS,
+	CHG_NOT_IN_PROGRESS,
+	CHG_FINISHED,
+};
+#define VBAT_TOLERANCE_MV	70
+#define CHG_DISABLE_MSLEEP	100
+static int is_charging_finished(struct pm8921_chg_chip *chip)
+{
+	int vbat_meas_uv, vbat_meas_mv, vbat_programmed, vbatdet_low;
+	int ichg_meas_ma, iterm_programmed;
+	int regulation_loop, fast_chg, vcp;
+	int rc;
+	int ext_in_charging;
+
+	static int last_vbat_programmed = -EINVAL;
+
+	if (!is_using_ext_charger(chip)) {
+		
+		fast_chg = pm_chg_get_rt_status(chip, FASTCHG_IRQ);
+		pr_debug("fast_chg = %d\n", fast_chg);
+		if (fast_chg == 0)
+			return CHG_NOT_IN_PROGRESS;
+
+		vcp = pm_chg_get_rt_status(chip, VCP_IRQ);
+		pr_debug("vcp = %d\n", vcp);
+		if (vcp == 1)
+			return CHG_IN_PROGRESS;
+
+		vbatdet_low = pm_chg_get_rt_status(chip, VBATDET_LOW_IRQ);
+		pr_debug("vbatdet_low = %d (htc skip this check)\n", vbatdet_low);
+
+		
+		rc = pm_chg_get_rt_status(chip, BAT_TEMP_OK_IRQ);
+		pr_debug("batt_temp_ok = %d\n", rc);
+		if (rc == 0)
+			return CHG_IN_PROGRESS;
+
+		
+		vbat_meas_uv = get_prop_battery_uvolts(chip);
+		if (vbat_meas_uv < 0)
+			return CHG_IN_PROGRESS;
+		vbat_meas_mv = vbat_meas_uv / 1000;
+
+		rc = pm_chg_vddmax_get(chip, &vbat_programmed);
+		if (rc) {
+			pr_err("couldnt read vddmax rc = %d\n", rc);
+			return CHG_IN_PROGRESS;
+		}
+		pr_debug("vddmax = %d vbat_meas_mv=%d\n",
+			 vbat_programmed, vbat_meas_mv);
+		if (vbat_meas_mv < vbat_programmed - VBAT_TOLERANCE_MV)
+			return CHG_IN_PROGRESS;
+
+		if (last_vbat_programmed == -EINVAL)
+			last_vbat_programmed = vbat_programmed;
+		if (last_vbat_programmed !=  vbat_programmed) {
+			
+			pr_debug("vddmax = %d last_vdd_max=%d\n",
+				 vbat_programmed, last_vbat_programmed);
+			last_vbat_programmed = vbat_programmed;
+			return CHG_IN_PROGRESS;
+		}
+
+		regulation_loop = pm_chg_get_regulation_loop(chip);
+		if (regulation_loop < 0) {
+			pr_err("couldnt read the regulation loop err=%d\n",
+				regulation_loop);
+			return CHG_IN_PROGRESS;
+		}
+		pr_debug("regulation_loop=%d\n", regulation_loop);
+
+		if (regulation_loop != 0 && regulation_loop != VDD_LOOP)
+			return CHG_IN_PROGRESS;
+	} 
+	else if(chip->ext_usb)
+	{
+
+		if(chip->ext_usb->ichg->get_charging_enabled)
+			chip->ext_usb->ichg->get_charging_enabled(&ext_in_charging);
+
+		if(!ext_in_charging)
+			return CHG_NOT_IN_PROGRESS;
+
+
+		
+		rc = pm_chg_get_rt_status(chip, BAT_TEMP_OK_IRQ);
+		pr_debug("batt_temp_ok = %d\n", rc);
+		if (rc == 0)
+			return CHG_IN_PROGRESS;
+
+		
+		vbat_meas_uv = get_prop_battery_uvolts(chip);
+		if (vbat_meas_uv < 0)
+			return CHG_IN_PROGRESS;
+		vbat_meas_mv = vbat_meas_uv / 1000;
+
+		rc = pm_chg_vddmax_get(chip, &vbat_programmed);
+		if (rc) {
+			pr_err("couldnt read vddmax rc = %d\n", rc);
+			return CHG_IN_PROGRESS;
+		}
+
+		pr_debug("vddmax = %d vbat_meas_mv=%d\n",
+			 vbat_programmed, vbat_meas_mv);
+		if (vbat_meas_mv < vbat_programmed - VBAT_TOLERANCE_MV)
+			return CHG_IN_PROGRESS;
+
+		if (last_vbat_programmed == -EINVAL)
+			last_vbat_programmed = vbat_programmed;
+		if (last_vbat_programmed !=  vbat_programmed) {
+			
+			pr_debug("vddmax = %d last_vdd_max=%d\n",
+				 vbat_programmed, last_vbat_programmed);
+			last_vbat_programmed = vbat_programmed;
+			return CHG_IN_PROGRESS;
+		}
+
+		
+		rc = pm_chg_iterm_get(chip, &iterm_programmed);
+
+		if (rc) {
+			pr_err("couldnt read iterm rc = %d\n", rc);
+			return CHG_IN_PROGRESS;
+		}
+
+		ichg_meas_ma = (get_prop_batt_current(chip)) / 1000;
+		pr_debug("iterm_programmed = %d ichg_meas_ma=%d\n",
+					iterm_programmed, ichg_meas_ma);
+		if (ichg_meas_ma > 0)
+			return CHG_IN_PROGRESS;
+
+		if (ichg_meas_ma * -1 > iterm_programmed)
+			return CHG_IN_PROGRESS;
+
+		return CHG_FINISHED;
+
+	}
+	else
+	{
+		
+	}
+
+
+	
+	rc = pm_chg_iterm_get(chip, &iterm_programmed);
+	if (rc) {
+		pr_err("couldnt read iterm rc = %d\n", rc);
+		return CHG_IN_PROGRESS;
+	}
+
+	ichg_meas_ma = (get_prop_batt_current(chip)) / 1000;
+	pr_debug("iterm_programmed = %d ichg_meas_ma=%d\n",
+				iterm_programmed, ichg_meas_ma);
+	if (ichg_meas_ma > 0)
+		return CHG_IN_PROGRESS;
+
+	if (ichg_meas_ma * -1 > iterm_programmed)
+		return CHG_IN_PROGRESS;
+
+	return CHG_FINISHED;
+}
+
+int pm_chg_program_vbatdet(struct pm8921_chg_chip *chip)
+{
+	int rc;
+	int vbat_programmed;
+
+	rc = pm_chg_vddmax_get(chip, &vbat_programmed);
+	if (rc) {
+		pr_err("couldnt read vddmax rc = %d\n", rc);
+		if (chip->is_bat_warm)
+			vbat_programmed = chip->warm_bat_voltage;
+		else if (chip->is_bat_cool)
+			vbat_programmed = chip->cool_bat_voltage;
+		else
+			vbat_programmed = chip->max_voltage_mv;
+	}
+	pr_info("program vbatdet=%d under %s condition\n",
+			vbat_programmed - chip->resume_voltage_delta,
+			(chip->is_bat_warm|chip->is_bat_cool) ? "warm/cool" : "normal");
+	rc = pm_chg_vbatdet_set(chip,
+				vbat_programmed - chip->resume_voltage_delta);
+	if (rc)
+		pr_err("Failed to set vbatdet=%d rc=%d\n",
+				vbat_programmed - chip->resume_voltage_delta, rc);
+
+	return rc;
+}
+
+#define CONSECUTIVE_COUNT	3
+#define EOC_STOP_CHG_COUNT	(CONSECUTIVE_COUNT + 180)
+#define CLEAR_FULL_STATE_BY_LEVEL_THR		90
+static void eoc_worker(struct work_struct *work)
+{
+	struct delayed_work *dwork = to_delayed_work(work);
+	struct pm8921_chg_chip *chip = container_of(dwork,
+				struct pm8921_chg_chip, eoc_work);
+	int end, soc = 0;
+
+	if (!is_ac_safety_timeout)
+		pm_chg_failed_clear(chip, 1);
+	end = is_charging_finished(chip);
+
+	if (end == CHG_NOT_IN_PROGRESS) {
+		
+		pr_info("%s: End due to fast_chg=%d\n",
+				__func__, pm_chg_get_rt_status(chip, FASTCHG_IRQ));
+		is_batt_full = false;
+		eoc_count = 0;
+		is_ac_safety_timeout_twice = false;
+		if (!flag_disable_wakelock)
+			wake_unlock(&chip->eoc_wake_lock);
+		return;
+	}
+
+	if (CONSECUTIVE_COUNT <= eoc_count)
+		end = CHG_FINISHED;
+
+	if (end == CHG_FINISHED) {
+		eoc_count++;
+	} else {
+		eoc_count = 0;
+	}
+
+	if (EOC_STOP_CHG_COUNT == eoc_count) {
+		eoc_count = 0;
+		is_ac_safety_timeout_twice = false;
+		pm_chg_program_vbatdet(chip);
+		pm_chg_disable_auto_enable(chip, 1, BATT_CHG_DISABLED_BIT_EOC);
+
+		if (is_ext_charging(chip))
+			chip->ext_charge_done = true;
+
+		if (chip->is_bat_warm || chip->is_bat_cool) {
+			pr_info("exit EXT-EOC-CHARGING phase at %s condition.\n",
+								(chip->is_bat_warm) ? "warm" : "cool");
+			is_batt_full = false;
+		} else {
+			pr_info("EXT-EOC-CHARGING phase done\n");
+		}
+		pr_info("vbatdet_low_irq=%d\n",
+						pm_chg_get_rt_status(chip, VBATDET_LOW_IRQ));
+		
+		chgdone_irq_handler(chip->pmic_chg_irq[CHGDONE_IRQ], chip);
+		
+		schedule_delayed_work(&chip->recharge_check_work,
+			      round_jiffies_relative(msecs_to_jiffies
+						     (EOC_CHECK_PERIOD_MS)));
+		wake_lock(&chip->recharge_check_wake_lock);
+
+		if (!flag_disable_wakelock)
+			wake_unlock(&chip->eoc_wake_lock);
+		return;
+	} else if (CONSECUTIVE_COUNT == eoc_count) {
+		if (chip->is_bat_warm || chip->is_bat_cool) {
+			pr_info("meet %s EOC condition.\n",
+								(chip->is_bat_warm) ? "warm" : "cool");
+			pm_chg_program_vbatdet(chip);
+			pm_chg_disable_auto_enable(chip, 1, BATT_CHG_DISABLED_BIT_EOC);
+			is_batt_full = false;
+			
+			chgdone_irq_handler(chip->pmic_chg_irq[CHGDONE_IRQ], chip);
+			if (!flag_disable_wakelock)
+				wake_unlock(&chip->eoc_wake_lock);
+		} else {
+			pr_info("EXT-EOC-CHARGING phase start\n");
+			is_batt_full = true;
+			pm8921_bms_charging_end(1);
+			htc_gauge_event_notify(HTC_GAUGE_EVENT_EOC);
+		}
+	}
+
+	if (is_batt_full) {
+		soc = get_prop_batt_capacity(chip);
+		if (soc < CLEAR_FULL_STATE_BY_LEVEL_THR) {
+			is_batt_full = false;
+			eoc_count = 0;
+			pr_info("%s: Clear is_batt_full & eoc_count due to"
+						" Overloading happened, soc=%d\n",
+						__func__, soc);
+			htc_gauge_event_notify(HTC_GAUGE_EVENT_EOC);
+		}
+	}
+
+	pr_debug("EOC count = %d\n", eoc_count);
+	schedule_delayed_work(&chip->eoc_work,
+		      round_jiffies_relative(msecs_to_jiffies
+					     (EOC_CHECK_PERIOD_MS)));
+
+}
+
+static void btm_configure_work(struct work_struct *work)
+{
+	int rc;
+
+	rc = pm8xxx_adc_btm_configure(&btm_config);
+	if (rc)
+		pr_err("failed to configure btm rc=%d", rc);
+}
+
+DECLARE_WORK(btm_config_work, btm_configure_work);
+
+static DEFINE_SPINLOCK(set_current_lock);
+static void set_appropriate_battery_current(struct pm8921_chg_chip *chip)
+{
+	unsigned int chg_current = chip->max_bat_chg_current;
+	unsigned long flags;
+
+	spin_lock_irqsave(&set_current_lock, flags);
+	if (chip->is_bat_cool)
+		chg_current = min(chg_current, chip->cool_bat_chg_current);
+
+	if (chip->is_bat_warm)
+		chg_current = min(chg_current, chip->warm_bat_chg_current);
+
+	if (thermal_mitigation != 0 && chip->thermal_mitigation)
+		chg_current = min(chg_current,
+				chip->thermal_mitigation[thermal_mitigation]);
+
+	if (chg_limit_current != 0)
+		chg_current = min(chg_current, chg_limit_current);
+
+	pm_chg_ibatmax_set(the_chip, chg_current);
+	spin_unlock_irqrestore(&set_current_lock, flags);
+}
+
+int pm8921_limit_charge_enable(bool enable)
+{
+	pr_info("limit_charge=%d\n", enable);
+	if (!the_chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if (enable)
+		chg_limit_current = PM8921_CHG_I_MIN_MA;
+	else
+		chg_limit_current = 0;
+
+	set_appropriate_battery_current(the_chip);
+	return 0;
+}
+
+#define TEMP_HYSTERISIS_DECIDEGC 20
+static void battery_cool(bool enter)
+{
+	pr_info("%s:enter=%d\n", __func__, enter);
+	if (enter == the_chip->is_bat_cool)
+		return;
+	the_chip->is_bat_cool = enter;
+	if (enter) {
+		btm_config.low_thr_temp =
+			the_chip->cool_temp_dc + TEMP_HYSTERISIS_DECIDEGC;
+		set_appropriate_battery_current(the_chip);
+		pm_chg_vddmax_set(the_chip, the_chip->cool_bat_voltage);
+		pm_chg_vbatdet_set(the_chip,
+			the_chip->cool_bat_voltage
+			- the_chip->resume_voltage_delta);
+		htc_gauge_event_notify(HTC_GAUGE_EVENT_TEMP_ZONE_CHANGE);
+	} else {
+		btm_config.low_thr_temp = the_chip->cool_temp_dc;
+		set_appropriate_battery_current(the_chip);
+		pm_chg_vddmax_set(the_chip, the_chip->max_voltage_mv);
+		pm_chg_vbatdet_set(the_chip, PM8921_CHG_VBATDET_MAX);
+		htc_gauge_event_notify(HTC_GAUGE_EVENT_TEMP_ZONE_CHANGE);
+	}
+
+	
+	if(the_chip->ext_usb)
+	{
+		queue_delayed_work(ext_charger_wq, &ext_charger_temp_task, HZ/200);
+	}
+
+	schedule_work(&btm_config_work);
+}
+
+static void battery_warm(bool enter)
+{
+	pr_info("%s:enter=%d\n", __func__, enter);
+	if (enter == the_chip->is_bat_warm)
+		return;
+	the_chip->is_bat_warm = enter;
+	if (enter) {
+		btm_config.high_thr_temp =
+			the_chip->warm_temp_dc - TEMP_HYSTERISIS_DECIDEGC;
+		set_appropriate_battery_current(the_chip);
+		pm_chg_vddmax_set(the_chip, the_chip->warm_bat_voltage);
+		pm_chg_vbatdet_set(the_chip,
+			the_chip->warm_bat_voltage
+			- the_chip->resume_voltage_delta);
+		htc_gauge_event_notify(HTC_GAUGE_EVENT_TEMP_ZONE_CHANGE);
+	} else {
+		btm_config.high_thr_temp = the_chip->warm_temp_dc;
+		set_appropriate_battery_current(the_chip);
+		pm_chg_vddmax_set(the_chip, the_chip->max_voltage_mv);
+		pm_chg_vbatdet_set(the_chip, PM8921_CHG_VBATDET_MAX);
+		htc_gauge_event_notify(HTC_GAUGE_EVENT_TEMP_ZONE_CHANGE);
+	}
+
+	
+	if(the_chip->ext_usb)
+	{
+		queue_delayed_work(ext_charger_wq, &ext_charger_temp_task, HZ/200);
+	}
+
+	schedule_work(&btm_config_work);
+}
+
+static int configure_btm(struct pm8921_chg_chip *chip)
+{
+	int rc;
+
+	if (chip->warm_temp_dc != INT_MIN)
+		btm_config.btm_warm_fn = battery_warm;
+	else
+		btm_config.btm_warm_fn = NULL;
+
+	if (chip->cool_temp_dc != INT_MIN)
+		btm_config.btm_cool_fn = battery_cool;
+	else
+		btm_config.btm_cool_fn = NULL;
+
+	btm_config.low_thr_temp = chip->cool_temp_dc;
+	btm_config.high_thr_temp = chip->warm_temp_dc;
+	btm_config.interval = chip->temp_check_period;
+	rc = pm8xxx_adc_btm_configure(&btm_config);
+	if (rc)
+		pr_err("failed to configure btm rc = %d\n", rc);
+	rc = pm8xxx_adc_btm_start();
+	if (rc)
+		pr_err("failed to start btm rc = %d\n", rc);
+
+	return rc;
+}
+
+int register_external_dc_charger(struct ext_chg_pm8921 *ext)
+{
+	if (the_chip == NULL) {
+		pr_err("called too early\n");
+		return -EINVAL;
+	}
+	
+	the_chip->ext = ext;
+	the_chip->ext_charging = false;
+
+	if (is_dc_chg_plugged_in(the_chip))
+		pm8921_disable_source_current(true); 
+
+	handle_start_ext_chg(the_chip);
+
+	return 0;
+}
+EXPORT_SYMBOL(register_external_dc_charger);
+
+void unregister_external_dc_charger(struct ext_chg_pm8921 *ext)
+{
+	if (the_chip == NULL) {
+		pr_err("called too early\n");
+		return;
+	}
+	handle_stop_ext_chg(the_chip);
+	the_chip->ext = NULL;
+}
+EXPORT_SYMBOL(unregister_external_dc_charger);
+
+static int set_usb_ovp_disable_param(const char *val, struct kernel_param *kp)
+{
+	int ret;
+
+	ret = param_set_int(val, kp);
+	if (ret) {
+		pr_err("set_usb_ovp_disable_param: error setting value %d\n", ret);
+		return ret;
+	}
+	pr_info("set_usb_ovp_disable_param: usb_ovp_disable=%d\n", usb_ovp_disable);
+	pm8921_usb_ovp_disable(usb_ovp_disable);
+	return 0;
+}
+module_param_call(ovp_disable, set_usb_ovp_disable_param, param_get_uint,
+					&usb_ovp_disable, 0644);
+
+static int set_disable_status_param(const char *val, struct kernel_param *kp)
+{
+	int ret;
+	struct pm8921_chg_chip *chip = the_chip;
+
+	ret = param_set_int(val, kp);
+	if (ret) {
+		pr_err("error setting value %d\n", ret);
+		return ret;
+	}
+	pr_info("factory set disable param to %d\n", charging_disabled);
+	if (chip) {
+		pm_chg_disable_auto_enable(chip, charging_disabled, BATT_CHG_DISABLED_BIT_USR1);
+		pm_chg_disable_pwrsrc(chip, charging_disabled, PWRSRC_DISABLED_BIT_USER);
+	}
+	return 0;
+}
+module_param_call(disabled, set_disable_status_param, param_get_uint,
+					&charging_disabled, 0644);
+
+static int set_auto_enable_param(const char *val, struct kernel_param *kp)
+{
+	int ret;
+	struct pm8921_chg_chip *chip = the_chip;
+
+	ret = param_set_int(val, kp);
+	if (ret) {
+		pr_err("error setting value %d\n", ret);
+		return ret;
+	}
+	pr_info("factory set auto enable param to %d\n", auto_enable);
+	if (chip)
+		pm_chg_disable_auto_enable(chip, !auto_enable, BATT_CHG_DISABLED_BIT_USR2);
+
+	return 0;
+}
+module_param_call(auto_enable, set_auto_enable_param, param_get_uint,
+					&auto_enable, 0644);
+
+static int set_therm_mitigation_level(const char *val, struct kernel_param *kp)
+{
+	int ret;
+	struct pm8921_chg_chip *chip = the_chip;
+
+	ret = param_set_int(val, kp);
+	if (ret) {
+		pr_err("error setting value %d\n", ret);
+		return ret;
+	}
+
+	if (!chip) {
+		pr_err("called before init\n");
+		return -EINVAL;
+	}
+
+	if (!chip->thermal_mitigation) {
+		pr_err("no thermal mitigation\n");
+		return -EINVAL;
+	}
+
+	if (thermal_mitigation < 0
+		|| thermal_mitigation >= chip->thermal_levels) {
+		pr_err("out of bound level selected\n");
+		return -EINVAL;
+	}
+
+	pr_info("set mitigation level(%d) current=%d\n",
+			thermal_mitigation, chip->thermal_mitigation[thermal_mitigation]);
+	set_appropriate_battery_current(chip);
+	return ret;
+}
+module_param_call(thermal_mitigation, set_therm_mitigation_level,
+					param_get_uint,
+					&thermal_mitigation, 0644);
+
+static int set_usb_max_current(const char *val, struct kernel_param *kp)
+{
+	int ret, mA;
+	struct pm8921_chg_chip *chip = the_chip;
+
+	ret = param_set_int(val, kp);
+	if (ret) {
+		pr_err("error setting value %d\n", ret);
+		return ret;
+	}
+	if (chip) {
+		pr_warn("setting current max to %d\n", usb_max_current);
+		pm_chg_iusbmax_get(chip, &mA);
+		if (mA > usb_max_current)
+			pm8921_charger_vbus_draw(usb_max_current);
+		return 0;
+	}
+	return -EINVAL;
+}
+module_param_call(usb_max_current, set_usb_max_current, param_get_uint,
+					&usb_max_current, 0644);
+
+static void free_irqs(struct pm8921_chg_chip *chip)
+{
+	int i;
+
+	for (i = 0; i < PM_CHG_MAX_INTS; i++)
+		if (chip->pmic_chg_irq[i]) {
+			free_irq(chip->pmic_chg_irq[i], chip);
+			chip->pmic_chg_irq[i] = 0;
+		}
+}
+
+static void __devinit determine_initial_state(struct pm8921_chg_chip *chip)
+{
+	unsigned long flags;
+	int fsm_state;
+	int usb_present;
+
+	chip->dc_present = !!is_dc_chg_plugged_in(chip);
+	usb_present = !!is_usb_chg_plugged_in(chip);
+	usbin_ov_irq_state = pm_chg_get_rt_status(the_chip, USBIN_OV_IRQ);
+	usbin_uv_irq_state = pm_chg_get_rt_status(the_chip, USBIN_UV_IRQ);
+	if ( usbin_ov_irq_state && !usb_present && !usbin_uv_irq_state) {
+		if (!ovp) {
+			ovp = 1;
+			pr_info("init OVP: 0 -> 1\n");
+		}
+	} else if ( !usbin_ov_irq_state && !usb_present && usbin_uv_irq_state) {
+		if (!uvp) {
+			uvp = 1;
+			pr_info("init UVP: 0 -> 1\n");
+		}
+	}
+	bat_temp_ok_prev = pm_chg_get_rt_status(chip, BAT_TEMP_OK_IRQ);
+
+	pm8921_chg_enable_irq(chip, DCIN_VALID_IRQ);
+	pm8921_chg_enable_irq(chip, USBIN_VALID_IRQ);
+	pm8921_chg_enable_irq(chip, BATT_REMOVED_IRQ);
+	pm8921_chg_enable_irq(chip, BATT_INSERTED_IRQ);
+	
+	
+	pm8921_chg_enable_irq(chip, DCIN_OV_IRQ);
+	pm8921_chg_enable_irq(chip, DCIN_UV_IRQ);
+	pm8921_chg_enable_irq(chip, CHGFAIL_IRQ);
+	pm8921_chg_enable_irq(chip, FASTCHG_IRQ);
+	pm8921_chg_enable_irq(chip, VBATDET_LOW_IRQ);
+	pm8921_chg_enable_irq(chip, BATTTEMP_HOT_IRQ);
+	pm8921_chg_enable_irq(chip, BATTTEMP_COLD_IRQ);
+	pm8921_chg_enable_irq(chip, BAT_TEMP_OK_IRQ);
+
+	spin_lock_irqsave(&vbus_lock, flags);
+	
+	cable_detection_vbus_irq_handler();
+	fastchg_irq_handler(chip->pmic_chg_irq[FASTCHG_IRQ], chip);
+#if 0
+	if (usb_chg_current) {
+		
+		handle_usb_insertion_removal(chip);
+		fastchg_irq_handler(chip->pmic_chg_irq[FASTCHG_IRQ], chip);
+	}
+#endif
+	spin_unlock_irqrestore(&vbus_lock, flags);
+
+	fsm_state = pm_chg_get_fsm_state(chip);
+	if (is_battery_charging(fsm_state)) {
+		chip->bms_notify.is_charging = 1;
+		pm8921_bms_charging_began();
+	}
+
+	check_battery_valid(chip);
+
+	pr_debug("usb = %d, dc = %d  batt = %d state=%d\n",
+			usb_present,
+			chip->dc_present,
+			get_prop_batt_present(chip),
+			fsm_state);
+}
+
+struct pm_chg_irq_init_data {
+	unsigned int	irq_id;
+	char		*name;
+	unsigned long	flags;
+	irqreturn_t	(*handler)(int, void *);
+};
+
+#define CHG_IRQ(_id, _flags, _handler) \
+{ \
+	.irq_id		= _id, \
+	.name		= #_id, \
+	.flags		= _flags, \
+	.handler	= _handler, \
+}
+struct pm_chg_irq_init_data chg_irq_data[] = {
+	CHG_IRQ(USBIN_VALID_IRQ, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+						usbin_valid_irq_handler),
+	CHG_IRQ(USBIN_OV_IRQ, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+						usbin_ov_irq_handler),
+	CHG_IRQ(BATT_INSERTED_IRQ, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+						batt_inserted_irq_handler),
+	CHG_IRQ(VBATDET_LOW_IRQ, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+						vbatdet_low_irq_handler),
+	CHG_IRQ(USBIN_UV_IRQ, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+						usbin_uv_irq_handler),
+	CHG_IRQ(VBAT_OV_IRQ, IRQF_TRIGGER_RISING, vbat_ov_irq_handler),
+	CHG_IRQ(CHGWDOG_IRQ, IRQF_TRIGGER_RISING, chgwdog_irq_handler),
+	CHG_IRQ(VCP_IRQ, IRQF_TRIGGER_RISING, vcp_irq_handler),
+	CHG_IRQ(ATCDONE_IRQ, IRQF_TRIGGER_RISING, atcdone_irq_handler),
+	CHG_IRQ(ATCFAIL_IRQ, IRQF_TRIGGER_RISING, atcfail_irq_handler),
+	CHG_IRQ(CHGDONE_IRQ, IRQF_TRIGGER_RISING, chgdone_irq_handler),
+	CHG_IRQ(CHGFAIL_IRQ, IRQF_TRIGGER_RISING, chgfail_irq_handler),
+	CHG_IRQ(CHGSTATE_IRQ, IRQF_TRIGGER_RISING, chgstate_irq_handler),
+	CHG_IRQ(LOOP_CHANGE_IRQ, IRQF_TRIGGER_RISING, loop_change_irq_handler),
+	CHG_IRQ(FASTCHG_IRQ, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+						fastchg_irq_handler),
+	CHG_IRQ(TRKLCHG_IRQ, IRQF_TRIGGER_RISING, trklchg_irq_handler),
+	CHG_IRQ(BATT_REMOVED_IRQ, IRQF_TRIGGER_RISING,
+						batt_removed_irq_handler),
+	CHG_IRQ(BATTTEMP_HOT_IRQ, IRQF_TRIGGER_RISING,
+						batttemp_hot_irq_handler),
+	CHG_IRQ(CHGHOT_IRQ, IRQF_TRIGGER_RISING, chghot_irq_handler),
+	CHG_IRQ(BATTTEMP_COLD_IRQ, IRQF_TRIGGER_RISING,
+						batttemp_cold_irq_handler),
+	CHG_IRQ(CHG_GONE_IRQ, IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , chg_gone_irq_handler),
+	CHG_IRQ(BAT_TEMP_OK_IRQ, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+						bat_temp_ok_irq_handler),
+	CHG_IRQ(COARSE_DET_LOW_IRQ, IRQF_TRIGGER_RISING,
+						coarse_det_low_irq_handler),
+	CHG_IRQ(VDD_LOOP_IRQ, IRQF_TRIGGER_RISING, vdd_loop_irq_handler),
+	CHG_IRQ(VREG_OV_IRQ, IRQF_TRIGGER_RISING, vreg_ov_irq_handler),
+	CHG_IRQ(VBATDET_IRQ, IRQF_TRIGGER_RISING, vbatdet_irq_handler),
+	CHG_IRQ(BATFET_IRQ, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+						batfet_irq_handler),
+	CHG_IRQ(DCIN_VALID_IRQ, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+						dcin_valid_irq_handler),
+	CHG_IRQ(DCIN_OV_IRQ, IRQF_TRIGGER_RISING, dcin_ov_irq_handler),
+	CHG_IRQ(DCIN_UV_IRQ, IRQF_TRIGGER_RISING, dcin_uv_irq_handler),
+};
+
+static int __devinit request_irqs(struct pm8921_chg_chip *chip,
+					struct platform_device *pdev)
+{
+	struct resource *res;
+	int ret, i;
+
+	ret = 0;
+	bitmap_fill(chip->enabled_irqs, PM_CHG_MAX_INTS);
+
+	for (i = 0; i < ARRAY_SIZE(chg_irq_data); i++) {
+		res = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
+				chg_irq_data[i].name);
+		if (res == NULL) {
+			pr_err("couldn't find %s\n", chg_irq_data[i].name);
+			goto err_out;
+		}
+		chip->pmic_chg_irq[chg_irq_data[i].irq_id] = res->start;
+		ret = request_irq(res->start, chg_irq_data[i].handler,
+			chg_irq_data[i].flags,
+			chg_irq_data[i].name, chip);
+		if (ret < 0) {
+			pr_err("couldn't request %d (%s) %d\n", res->start,
+					chg_irq_data[i].name, ret);
+			chip->pmic_chg_irq[chg_irq_data[i].irq_id] = 0;
+			goto err_out;
+		}
+		pm8921_chg_disable_irq(chip, chg_irq_data[i].irq_id);
+	}
+	return 0;
+
+err_out:
+	free_irqs(chip);
+	return -EINVAL;
+}
+
+static void pm8921_chg_force_19p2mhz_clk(struct pm8921_chg_chip *chip)
+{
+	int err;
+	u8 temp;
+
+	temp  = 0xD1;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+
+	temp  = 0xD3;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+
+	temp  = 0xD1;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+
+	temp  = 0xD5;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+
+	udelay(183);
+
+	temp  = 0xD1;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+
+	temp  = 0xD0;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+	udelay(32);
+
+	temp  = 0xD1;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+
+	temp  = 0xD3;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+}
+
+static void pm8921_chg_set_hw_clk_switching(struct pm8921_chg_chip *chip)
+{
+	int err;
+	u8 temp;
+
+	temp  = 0xD1;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+
+	temp  = 0xD0;
+	err = pm8xxx_writeb(chip->dev->parent, CHG_TEST, temp);
+	if (err) {
+		pr_err("Error %d writing %d to addr %d\n", err, temp, CHG_TEST);
+		return;
+	}
+}
+
+#define ENUM_TIMER_STOP_BIT	BIT(1)
+#define BOOT_DONE_BIT		BIT(6)
+#define CHG_BATFET_ON_BIT	BIT(3)
+#define CHG_VCP_EN		BIT(0)
+#define CHG_BAT_TEMP_DIS_BIT	BIT(2)
+#define SAFE_CURRENT_MA		1500
+#define VREF_BATT_THERM_FORCE_ON	BIT(7)
+static int __devinit pm8921_chg_hw_init(struct pm8921_chg_chip *chip)
+{
+	int rc;
+	unsigned long flags;
+
+	
+	pm8921_chg_force_19p2mhz_clk(chip);
+
+	rc = pm_chg_masked_write(chip, SYS_CONFIG_2,
+					BOOT_DONE_BIT, BOOT_DONE_BIT);
+	if (rc) {
+		pr_err("Failed to set BOOT_DONE_BIT rc=%d\n", rc);
+		return rc;
+	}
+
+	rc = pm_chg_vddsafe_set(chip, chip->max_voltage_mv);
+	if (rc) {
+		pr_err("Failed to set safe voltage to %d rc=%d\n",
+						chip->max_voltage_mv, rc);
+		return rc;
+	}
+
+	pr_info("Init: Set vbatdet=%d\n", PM8921_CHG_VBATDET_MAX);
+	rc = pm_chg_vbatdet_set(chip, PM8921_CHG_VBATDET_MAX);
+	if (rc) {
+		pr_err("Failed to set vbatdet comprator voltage to %d rc=%d\n",
+			chip->max_voltage_mv, rc);
+		return rc;
+	}
+
+	rc = pm_chg_vddmax_set(chip, chip->max_voltage_mv);
+	if (rc) {
+		pr_err("Failed to set max voltage to %d rc=%d\n",
+						chip->max_voltage_mv, rc);
+		return rc;
+	}
+	rc = pm_chg_ibatsafe_set(chip, SAFE_CURRENT_MA);
+	if (rc) {
+		pr_err("Failed to set max voltage to %d rc=%d\n",
+						SAFE_CURRENT_MA, rc);
+		return rc;
+	}
+
+	rc = pm_chg_ibatmax_set(chip, chip->max_bat_chg_current);
+	if (rc) {
+		pr_err("Failed to set max current to 400 rc=%d\n", rc);
+		return rc;
+	}
+
+	rc = pm_chg_iterm_set(chip, chip->term_current);
+	if (rc) {
+		pr_err("Failed to set term current to %d rc=%d\n",
+						chip->term_current, rc);
+		return rc;
+	}
+
+	
+	rc = pm_chg_masked_write(chip, PBL_ACCESS2, ENUM_TIMER_STOP_BIT,
+			ENUM_TIMER_STOP_BIT);
+	if (rc) {
+		pr_err("Failed to set enum timer stop rc=%d\n", rc);
+		return rc;
+	}
+
+	if (chip->safety_time != 0) {
+		if (chip->safety_time > SAFETY_TIME_MAX_LIMIT) {
+			rc = pm_chg_tchg_max_set(chip, SAFETY_TIME_8HR_TWICE);
+		} else {
+			rc = pm_chg_tchg_max_set(chip, chip->safety_time);
+		}
+		if (rc) {
+			pr_err("Failed to set max time to %d minutes rc=%d\n",
+							chip->safety_time, rc);
+			return rc;
+		}
+	}
+
+	if (chip->ttrkl_time != 0) {
+		rc = pm_chg_ttrkl_max_set(chip, chip->ttrkl_time);
+		if (rc) {
+			pr_err("Failed to set trkl time to %d minutes rc=%d\n",
+							chip->ttrkl_time, rc);
+			return rc;
+		}
+	}
+
+	if (chip->vin_min != 0) {
+		rc = pm_chg_vinmin_set(chip, chip->vin_min);
+		if (rc) {
+			pr_err("Failed to set vin min to %d mV rc=%d\n",
+							chip->vin_min, rc);
+			return rc;
+		}
+	} else
+		chip->vin_min = pm_chg_vinmin_get(chip);
+
+	rc = pm_chg_disable_wd(chip);
+	if (rc) {
+		pr_err("Failed to disable wd rc=%d\n", rc);
+		return rc;
+	}
+
+	if (flag_keep_charge_on || flag_pa_recharge)
+		rc = pm_chg_masked_write(chip, CHG_CNTRL_2,
+					CHG_BAT_TEMP_DIS_BIT,
+					CHG_BAT_TEMP_DIS_BIT); 
+	else
+		rc = pm_chg_masked_write(chip, CHG_CNTRL_2,
+					CHG_BAT_TEMP_DIS_BIT, 0); 
+	if (rc) {
+		pr_err("Failed to enable/disable temp control chg rc=%d\n", rc);
+		return rc;
+	}
+
+	
+	rc = pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CLOCK_CTRL, 0x15);
+	if (rc) {
+		pr_err("Failed to switch buck clk rc=%d\n", rc);
+		return rc;
+	}
+
+	if (chip->trkl_voltage != 0) {
+		rc = pm_chg_vtrkl_low_set(chip, chip->trkl_voltage);
+		if (rc) {
+			pr_err("Failed to set trkl voltage to %dmv  rc=%d\n",
+							chip->trkl_voltage, rc);
+			return rc;
+		}
+	}
+
+	if (chip->weak_voltage != 0) {
+		rc = pm_chg_vweak_set(chip, chip->weak_voltage);
+		if (rc) {
+			pr_err("Failed to set weak voltage to %dmv  rc=%d\n",
+							chip->weak_voltage, rc);
+			return rc;
+		}
+	}
+
+	if (chip->trkl_current != 0) {
+		rc = pm_chg_itrkl_set(chip, chip->trkl_current);
+		if (rc) {
+			pr_err("Failed to set trkl current to %dmA  rc=%d\n",
+							chip->trkl_voltage, rc);
+			return rc;
+		}
+	}
+
+	if (chip->weak_current != 0) {
+		rc = pm_chg_iweak_set(chip, chip->weak_current);
+		if (rc) {
+			pr_err("Failed to set weak current to %dmA  rc=%d\n",
+							chip->weak_current, rc);
+			return rc;
+		}
+	}
+
+	rc = pm_chg_batt_cold_temp_config(chip, chip->cold_thr);
+	if (rc) {
+		pr_err("Failed to set cold config %d  rc=%d\n",
+						chip->cold_thr, rc);
+	}
+
+	rc = pm_chg_batt_hot_temp_config(chip, chip->hot_thr);
+	if (rc) {
+		pr_err("Failed to set hot config %d  rc=%d\n",
+						chip->hot_thr, rc);
+	}
+
+	
+	if (pm8xxx_get_revision(chip->dev->parent) < PM8XXX_REVISION_8921_2p0) {
+		pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST2, 0xF1);
+		pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, 0xCE);
+		pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, 0xD8);
+
+		
+		pm8xxx_writeb(chip->dev->parent, PSI_TXRX_SAMPLE_DATA_0, 0xFF);
+		pm8xxx_writeb(chip->dev->parent, PSI_TXRX_SAMPLE_DATA_1, 0xFF);
+		pm8xxx_writeb(chip->dev->parent, PSI_TXRX_SAMPLE_DATA_2, 0xFF);
+		pm8xxx_writeb(chip->dev->parent, PSI_TXRX_SAMPLE_DATA_3, 0xFF);
+		pm8xxx_writeb(chip->dev->parent, PSI_CONFIG_STATUS, 0x0D);
+		udelay(100);
+		pm8xxx_writeb(chip->dev->parent, PSI_CONFIG_STATUS, 0x0C);
+	}
+
+	
+	if (pm8xxx_get_revision(chip->dev->parent) == PM8XXX_REVISION_8921_3p0)
+		pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, 0xAC);
+
+	pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, 0xD9);
+
+	
+	pm8xxx_writeb(chip->dev->parent, CHG_BUCK_CTRL_TEST3, 0x91);
+
+	rc = pm_chg_masked_write(chip, CHG_CNTRL, VREF_BATT_THERM_FORCE_ON,
+						VREF_BATT_THERM_FORCE_ON);
+	if (rc)
+		pr_err("Failed to Force Vref therm rc=%d\n", rc);
+
+	spin_lock_irqsave(&pwrsrc_lock, flags);
+	rc = pm_chg_charge_dis(chip, charging_disabled);
+	spin_unlock_irqrestore(&pwrsrc_lock, flags);
+	if (rc) {
+		pr_err("Failed to disable CHG_CHARGE_DIS bit rc=%d\n", rc);
+		return rc;
+	}
+
+	spin_lock_irqsave(&charger_lock, flags);
+	rc = pm_chg_auto_enable(chip, !batt_charging_disabled);
+	spin_unlock_irqrestore(&charger_lock, flags);
+	if (rc) {
+		pr_err("Failed to enable charging rc=%d\n", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+static int get_rt_status(void *data, u64 *val)
+{
+	int i = (int)data;
+	int ret;
+
+	
+	ret = pm_chg_get_rt_status(the_chip, i);
+	*val = ret;
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(rt_fops, get_rt_status, NULL, "%llu\n");
+
+static int get_fsm_status(void *data, u64 *val)
+{
+	u8 temp;
+
+	temp = pm_chg_get_fsm_state(the_chip);
+	*val = temp;
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(fsm_fops, get_fsm_status, NULL, "%llu\n");
+
+static int get_reg_loop(void *data, u64 *val)
+{
+	u8 temp;
+
+	if (!the_chip) {
+		pr_err("%s called before init\n", __func__);
+		return -EINVAL;
+	}
+	temp = pm_chg_get_regulation_loop(the_chip);
+	*val = temp;
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(reg_loop_fops, get_reg_loop, NULL, "0x%02llx\n");
+
+static int get_reg(void *data, u64 *val)
+{
+	int addr = (int)data;
+	int ret;
+	u8 temp;
+
+	ret = pm8xxx_readb(the_chip->dev->parent, addr, &temp);
+	if (ret) {
+		pr_err("pm8xxx_readb to %x value =%d errored = %d\n",
+			addr, temp, ret);
+		return -EAGAIN;
+	}
+	*val = temp;
+	return 0;
+}
+
+static int set_reg(void *data, u64 val)
+{
+	int addr = (int)data;
+	int ret;
+	u8 temp;
+
+	temp = (u8) val;
+	ret = pm8xxx_writeb(the_chip->dev->parent, addr, temp);
+	if (ret) {
+		pr_err("pm8xxx_writeb to %x value =%d errored = %d\n",
+			addr, temp, ret);
+		return -EAGAIN;
+	}
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(reg_fops, get_reg, set_reg, "0x%02llx\n");
+
+enum {
+	BAT_WARM_ZONE,
+	BAT_COOL_ZONE,
+};
+static int get_warm_cool(void *data, u64 * val)
+{
+	if (!the_chip) {
+		pr_err("%s called before init\n", __func__);
+		return -EINVAL;
+	}
+	if ((int)data == BAT_WARM_ZONE)
+		*val = the_chip->is_bat_warm;
+	if ((int)data == BAT_COOL_ZONE)
+		*val = the_chip->is_bat_cool;
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(warm_cool_fops, get_warm_cool, NULL, "0x%lld\n");
+
+static void create_debugfs_entries(struct pm8921_chg_chip *chip)
+{
+	int i;
+
+	chip->dent = debugfs_create_dir("pm8921_chg", NULL);
+
+	if (IS_ERR(chip->dent)) {
+		pr_err("pmic charger couldnt create debugfs dir\n");
+		return;
+	}
+
+	debugfs_create_file("CHG_CNTRL", 0644, chip->dent,
+			    (void *)CHG_CNTRL, &reg_fops);
+	debugfs_create_file("CHG_CNTRL_2", 0644, chip->dent,
+			    (void *)CHG_CNTRL_2, &reg_fops);
+	debugfs_create_file("CHG_CNTRL_3", 0644, chip->dent,
+			    (void *)CHG_CNTRL_3, &reg_fops);
+	debugfs_create_file("PBL_ACCESS1", 0644, chip->dent,
+			    (void *)PBL_ACCESS1, &reg_fops);
+	debugfs_create_file("PBL_ACCESS2", 0644, chip->dent,
+			    (void *)PBL_ACCESS2, &reg_fops);
+	debugfs_create_file("SYS_CONFIG_1", 0644, chip->dent,
+			    (void *)SYS_CONFIG_1, &reg_fops);
+	debugfs_create_file("SYS_CONFIG_2", 0644, chip->dent,
+			    (void *)SYS_CONFIG_2, &reg_fops);
+	debugfs_create_file("CHG_VDD_MAX", 0644, chip->dent,
+			    (void *)CHG_VDD_MAX, &reg_fops);
+	debugfs_create_file("CHG_VDD_SAFE", 0644, chip->dent,
+			    (void *)CHG_VDD_SAFE, &reg_fops);
+	debugfs_create_file("CHG_VBAT_DET", 0644, chip->dent,
+			    (void *)CHG_VBAT_DET, &reg_fops);
+	debugfs_create_file("CHG_IBAT_MAX", 0644, chip->dent,
+			    (void *)CHG_IBAT_MAX, &reg_fops);
+	debugfs_create_file("CHG_IBAT_SAFE", 0644, chip->dent,
+			    (void *)CHG_IBAT_SAFE, &reg_fops);
+	debugfs_create_file("CHG_VIN_MIN", 0644, chip->dent,
+			    (void *)CHG_VIN_MIN, &reg_fops);
+	debugfs_create_file("CHG_VTRICKLE", 0644, chip->dent,
+			    (void *)CHG_VTRICKLE, &reg_fops);
+	debugfs_create_file("CHG_ITRICKLE", 0644, chip->dent,
+			    (void *)CHG_ITRICKLE, &reg_fops);
+	debugfs_create_file("CHG_ITERM", 0644, chip->dent,
+			    (void *)CHG_ITERM, &reg_fops);
+	debugfs_create_file("CHG_TCHG_MAX", 0644, chip->dent,
+			    (void *)CHG_TCHG_MAX, &reg_fops);
+	debugfs_create_file("CHG_TWDOG", 0644, chip->dent,
+			    (void *)CHG_TWDOG, &reg_fops);
+	debugfs_create_file("CHG_TEMP_THRESH", 0644, chip->dent,
+			    (void *)CHG_TEMP_THRESH, &reg_fops);
+	debugfs_create_file("CHG_COMP_OVR", 0644, chip->dent,
+			    (void *)CHG_COMP_OVR, &reg_fops);
+	debugfs_create_file("CHG_BUCK_CTRL_TEST1", 0644, chip->dent,
+			    (void *)CHG_BUCK_CTRL_TEST1, &reg_fops);
+	debugfs_create_file("CHG_BUCK_CTRL_TEST2", 0644, chip->dent,
+			    (void *)CHG_BUCK_CTRL_TEST2, &reg_fops);
+	debugfs_create_file("CHG_BUCK_CTRL_TEST3", 0644, chip->dent,
+			    (void *)CHG_BUCK_CTRL_TEST3, &reg_fops);
+	debugfs_create_file("CHG_TEST", 0644, chip->dent,
+			    (void *)CHG_TEST, &reg_fops);
+	debugfs_create_file("USB_OVP_CONTROL", 0644, chip->dent,
+			    (void *)USB_OVP_CONTROL, &reg_fops);
+
+	debugfs_create_file("FSM_STATE", 0644, chip->dent, NULL,
+			    &fsm_fops);
+
+	debugfs_create_file("REGULATION_LOOP_CONTROL", 0644, chip->dent, NULL,
+			    &reg_loop_fops);
+
+	debugfs_create_file("BAT_WARM_ZONE", 0644, chip->dent,
+				(void *)BAT_WARM_ZONE, &warm_cool_fops);
+	debugfs_create_file("BAT_COOL_ZONE", 0644, chip->dent,
+				(void *)BAT_COOL_ZONE, &warm_cool_fops);
+
+	for (i = 0; i < ARRAY_SIZE(chg_irq_data); i++) {
+		if (chip->pmic_chg_irq[chg_irq_data[i].irq_id])
+			debugfs_create_file(chg_irq_data[i].name, 0444,
+				chip->dent,
+				(void *)chg_irq_data[i].irq_id,
+				&rt_fops);
+	}
+}
+
+static void pm_chg_reset_warm_cool_state(struct pm8921_chg_chip *chip)
+{
+	pr_debug("chip->is_bat_warm=%d, chip->is_bat_cool=%d\n",
+						chip->is_bat_warm, chip->is_bat_cool);
+
+	if (chip->is_bat_cool)
+			battery_cool(0);
+	if (chip->is_bat_warm)
+			battery_warm(0);
+}
+
+static int pm8921_charger_suspend_noirq(struct device *dev)
+{
+	int rc;
+	struct pm8921_chg_chip *chip = dev_get_drvdata(dev);
+
+	rc = pm_chg_masked_write(chip, CHG_CNTRL, VREF_BATT_THERM_FORCE_ON, 0);
+	if (rc)
+		pr_err("Failed to Force Vref therm off rc=%d\n", rc);
+	pm8921_chg_set_hw_clk_switching(chip);
+	return 0;
+}
+
+static int pm8921_charger_resume_noirq(struct device *dev)
+{
+	int rc;
+	struct pm8921_chg_chip *chip = dev_get_drvdata(dev);
+
+	pm8921_chg_force_19p2mhz_clk(chip);
+
+	rc = pm_chg_masked_write(chip, CHG_CNTRL, VREF_BATT_THERM_FORCE_ON,
+						VREF_BATT_THERM_FORCE_ON);
+	if (rc)
+		pr_err("Failed to Force Vref therm on rc=%d\n", rc);
+	return 0;
+}
+
+static int pm8921_charger_resume(struct device *dev)
+{
+	int rc;
+	struct pm8921_chg_chip *chip = dev_get_drvdata(dev);
+
+	if (!(chip->cool_temp_dc == INT_MIN && chip->warm_temp_dc == INT_MIN)
+		&& !(chip->keep_btm_on_suspend)) {
+		rc = pm8xxx_adc_btm_configure(&btm_config);
+		if (rc)
+			pr_err("couldn't reconfigure btm rc=%d\n", rc);
+
+		pm_chg_reset_warm_cool_state(chip);
+
+		rc = pm8xxx_adc_btm_start();
+		if (rc)
+			pr_err("couldn't restart btm rc=%d\n", rc);
+	}
+	if (pm8921_chg_is_enabled(chip, LOOP_CHANGE_IRQ)) {
+		disable_irq_wake(chip->pmic_chg_irq[LOOP_CHANGE_IRQ]);
+		pm8921_chg_disable_irq(chip, LOOP_CHANGE_IRQ);
+	}
+	return 0;
+}
+
+static int pm8921_charger_suspend(struct device *dev)
+{
+	int rc;
+	struct pm8921_chg_chip *chip = dev_get_drvdata(dev);
+
+	if (!(chip->cool_temp_dc == INT_MIN && chip->warm_temp_dc == INT_MIN)
+		&& !(chip->keep_btm_on_suspend)) {
+		rc = pm8xxx_adc_btm_end();
+		if (rc)
+			pr_err("Failed to disable BTM on suspend rc=%d\n", rc);
+	}
+	if (is_usb_chg_plugged_in(chip)) {
+		pm8921_chg_enable_irq(chip, LOOP_CHANGE_IRQ);
+		enable_irq_wake(chip->pmic_chg_irq[LOOP_CHANGE_IRQ]);
+	}
+	return 0;
+}
+
+static const struct dev_pm_ops pm8921_charger_pm_ops = {
+	.suspend	= pm8921_charger_suspend,
+	.suspend_noirq  = pm8921_charger_suspend_noirq,
+	.resume_noirq   = pm8921_charger_resume_noirq,
+	.resume		= pm8921_charger_resume,
+};
+
+static void ext_charger_vbat_low_handler(struct work_struct *w)
+{
+	int result;
+
+	pm8921_get_batt_voltage(&result);
+
+	pr_info("%s, vol:%d\n", __func__, result);
+
+	
+
+	if(!(the_chip->ext_usb->ichg->event_notify))
+	{
+		pr_err("%s event_notify api error!\n", __func__);
+		return;
+	}
+
+	the_chip->ext_usb->ichg->event_notify(HTC_EXTCHG_EVENT_TYPE_EOC_START_CHARGE);
+
+	
+	if (!flag_disable_wakelock)
+		wake_lock(&the_chip->eoc_wake_lock);
+	schedule_delayed_work(&the_chip->eoc_work,
+		round_jiffies_relative(msecs_to_jiffies
+					     (EOC_CHECK_PERIOD_MS)));
+
+	return;
+}
+
+
+static void ext_charger_chgdone_handler(struct work_struct *w)
+{
+	int result;
+
+	pm8921_get_batt_voltage(&result);
+
+	pr_info("%s, vol:%d\n", __func__, result);
+
+	if(!(the_chip->ext_usb->ichg->event_notify))
+	{
+		pr_err("%s event_notify api error!\n", __func__);
+		return;
+	}
+
+	
+	the_chip->ext_usb->ichg->event_notify(HTC_EXTCHG_EVENT_TYPE_EOC_STOP_CHARGE);
+
+	return;
+}
+
+
+static void ext_charger_temp_handler(struct work_struct *w)
+{
+	int new_temp;
+	int hot_irq;
+	int cold_irq;
+
+	cold_irq = pm_chg_get_rt_status(the_chip, BATTTEMP_COLD_IRQ);
+	hot_irq = pm_chg_get_rt_status(the_chip, BATTTEMP_HOT_IRQ);
+
+	pr_info("%s, cold_irq:%d, hot_irq:%d, is_bat_warm:%d, is_bat_cool:%d,\n",
+		__func__, cold_irq, hot_irq, the_chip->is_bat_warm, the_chip->is_bat_cool);
+
+
+	if(!(the_chip->ext_usb->ichg->event_notify))
+	{
+		pr_err("%s event_notify api error!\n", __func__);
+		return;
+	}
+
+	
+	if(the_chip->is_bat_warm)
+	{
+		if(hot_irq)
+			new_temp = HTC_EXTCHG_EVENT_TYPE_TEMP_HOT;
+		else
+			new_temp = HTC_EXTCHG_EVENT_TYPE_TEMP_WARM;
+	}
+	else if(the_chip->is_bat_cool)
+	{
+		if(cold_irq)
+			new_temp = HTC_EXTCHG_EVENT_TYPE_TEMP_COLD;
+		else
+			new_temp = HTC_EXTCHG_EVENT_TYPE_TEMP_COOL;
+	}
+	else
+		new_temp = HTC_EXTCHG_EVENT_TYPE_TEMP_NORMAL;
+
+
+	
+	if(extchg_temp_condition_old == new_temp)
+		return;
+
+	
+	the_chip->ext_usb->ichg->event_notify(new_temp);
+
+	extchg_temp_condition_old = new_temp;
+
+}
+
+static int __devinit pm8921_charger_probe(struct platform_device *pdev)
+{
+	int rc = 0;
+	struct pm8921_chg_chip *chip;
+	const struct pm8921_charger_platform_data *pdata
+				= pdev->dev.platform_data;
+	const struct pm8921_charger_batt_param *chg_batt_param;
+
+
+	if (!pdata) {
+		pr_err("missing platform data\n");
+		return -EINVAL;
+	}
+
+	chip = kzalloc(sizeof(struct pm8921_chg_chip),
+					GFP_KERNEL);
+	if (!chip) {
+		pr_err("Cannot allocate pm_chg_chip\n");
+		return -ENOMEM;
+	}
+
+	chip->dev = &pdev->dev;
+	chip->safety_time = pdata->safety_time;
+	chip->ttrkl_time = pdata->ttrkl_time;
+	chip->update_time = pdata->update_time;
+	
+	chg_batt_param = htc_battery_cell_get_cur_cell_charger_cdata();
+	if (!chg_batt_param) {
+		chip->max_voltage_mv = pdata->max_voltage;
+		chip->cool_bat_voltage = pdata->cool_bat_voltage;
+		chip->warm_bat_voltage = pdata->warm_bat_voltage;
+	} else {
+		chip->max_voltage_mv = chg_batt_param->max_voltage;
+		chip->cool_bat_voltage = chg_batt_param->cool_bat_voltage;
+		chip->warm_bat_voltage = chg_batt_param->warm_bat_voltage;
+	}
+	pr_info("%s: max_vbat=%u, cool_vbat=%u, warm_vbat=%u\n",
+			__func__, chip->max_voltage_mv, chip->cool_bat_voltage,
+			chip->warm_bat_voltage);
+	chip->min_voltage_mv = pdata->min_voltage;
+	chip->resume_voltage_delta = pdata->resume_voltage_delta;
+	chip->term_current = pdata->term_current;
+	chip->vbat_channel = pdata->charger_cdata.vbat_channel;
+	chip->batt_temp_channel = pdata->charger_cdata.batt_temp_channel;
+	chip->batt_id_channel = pdata->charger_cdata.batt_id_channel;
+	chip->batt_id_min = pdata->batt_id_min;
+	chip->batt_id_max = pdata->batt_id_max;
+	if (pdata->cool_temp != INT_MIN)
+		chip->cool_temp_dc = pdata->cool_temp * 10;
+	else
+		chip->cool_temp_dc = INT_MIN;
+
+	if (pdata->warm_temp != INT_MIN)
+		chip->warm_temp_dc = pdata->warm_temp * 10;
+	else
+		chip->warm_temp_dc = INT_MIN;
+
+	chip->temp_check_period = pdata->temp_check_period;
+	chip->dc_unplug_check = pdata->dc_unplug_check;
+	chip->max_bat_chg_current = pdata->max_bat_chg_current;
+	chip->cool_bat_chg_current = pdata->cool_bat_chg_current;
+	chip->warm_bat_chg_current = pdata->warm_bat_chg_current;
+	chip->keep_btm_on_suspend = pdata->keep_btm_on_suspend;
+	chip->trkl_voltage = pdata->trkl_voltage;
+	chip->weak_voltage = pdata->weak_voltage;
+	chip->trkl_current = pdata->trkl_current;
+	chip->weak_current = pdata->weak_current;
+	chip->vin_min = pdata->vin_min;
+	chip->thermal_mitigation = pdata->thermal_mitigation;
+	chip->thermal_levels = pdata->thermal_levels;
+	chip->mbat_in_gpio = pdata->mbat_in_gpio;
+	chip->is_embeded_batt = pdata->is_embeded_batt;
+
+	chip->cold_thr = pdata->cold_thr;
+	chip->hot_thr = pdata->hot_thr;
+
+	chip->ext_usb = pdata->ext_usb;
+
+	rc = pm8921_chg_hw_init(chip);
+	if (rc) {
+		pr_err("couldn't init hardware rc=%d\n", rc);
+		goto free_chip;
+	}
+
+	platform_set_drvdata(pdev, chip);
+	the_chip = chip;
+
+	wake_lock_init(&chip->eoc_wake_lock, WAKE_LOCK_SUSPEND, "pm8921_eoc");
+	wake_lock_init(&chip->recharge_check_wake_lock, WAKE_LOCK_SUSPEND,
+												"pm8921_recharge_check");
+	wake_lock_init(&chip->unplug_ovp_fet_open_wake_lock,
+			WAKE_LOCK_SUSPEND, "pm8921_unplug_ovp_fet_open_wake_lock");
+	INIT_DELAYED_WORK(&chip->eoc_work, eoc_worker);
+	INIT_DELAYED_WORK(&chip->recharge_check_work, recharge_check_worker);
+	INIT_DELAYED_WORK(&chip->vin_collapse_check_work,
+						vin_collapse_check_worker);
+	INIT_WORK(&chip->unplug_ovp_fet_open_work,
+					unplug_ovp_fet_open_worker);
+	INIT_DELAYED_WORK(&chip->unplug_check_work, unplug_check_worker);
+
+	INIT_DELAYED_WORK(&ext_charger_vbat_low_task, ext_charger_vbat_low_handler);
+	INIT_DELAYED_WORK(&ext_charger_chgdone_task, ext_charger_chgdone_handler);
+	INIT_DELAYED_WORK(&ext_charger_temp_task, ext_charger_temp_handler);
+
+	ext_charger_wq = create_singlethread_workqueue("ext_charger_wq");
+
+	if (!ext_charger_wq) {
+		pr_err("Failed to create ext_charger_wq workqueue.");
+		goto free_chip;
+	}
+
+	rc = request_irqs(chip, pdev);
+	if (rc) {
+		pr_err("couldn't register interrupts rc=%d\n", rc);
+		goto free_chip;
+	}
+
+	enable_irq_wake(chip->pmic_chg_irq[USBIN_VALID_IRQ]);
+	enable_irq_wake(chip->pmic_chg_irq[DCIN_VALID_IRQ]);
+	enable_irq_wake(chip->pmic_chg_irq[VBATDET_LOW_IRQ]);
+	enable_irq_wake(chip->pmic_chg_irq[FASTCHG_IRQ]);
+	enable_irq_wake(chip->pmic_chg_irq[BATT_REMOVED_IRQ]);
+	if (!(chip->cool_temp_dc == INT_MIN && chip->warm_temp_dc == INT_MIN) &&
+		!flag_keep_charge_on && !flag_pa_recharge) {
+		rc = configure_btm(chip);
+		if (rc) {
+			pr_err("couldn't register with btm rc=%d\n", rc);
+			goto free_irq;
+		}
+	}
+
+	create_debugfs_entries(chip);
+
+	INIT_WORK(&chip->bms_notify.work, bms_notify);
+	INIT_WORK(&chip->battery_id_valid_work, battery_id_valid);
+
+	
+	determine_initial_state(chip);
+
+	if (0) {
+		INIT_DELAYED_WORK(&chip->update_heartbeat_work,
+							update_heartbeat);
+		schedule_delayed_work(&chip->update_heartbeat_work,
+				      round_jiffies_relative(msecs_to_jiffies
+							(chip->update_time)));
+	}
+	htc_charger_event_notify(HTC_CHARGER_EVENT_READY);
+	htc_gauge_event_notify(HTC_GAUGE_EVENT_READY);
+	if (ovp)
+		htc_charger_event_notify(HTC_CHARGER_EVENT_OVP);
+
+	return 0;
+
+free_irq:
+	free_irqs(chip);
+free_chip:
+	kfree(chip);
+	return rc;
+}
+
+static int __devexit pm8921_charger_remove(struct platform_device *pdev)
+{
+	struct pm8921_chg_chip *chip = platform_get_drvdata(pdev);
+
+	free_irqs(chip);
+	platform_set_drvdata(pdev, NULL);
+	the_chip = NULL;
+	kfree(chip);
+	return 0;
+}
+
+static struct platform_driver pm8921_charger_driver = {
+	.probe	= pm8921_charger_probe,
+	.remove	= __devexit_p(pm8921_charger_remove),
+	.driver	= {
+		.name	= PM8921_CHARGER_DEV_NAME,
+		.owner	= THIS_MODULE,
+		.pm = &pm8921_charger_pm_ops,
+	},
+};
+
+static int __init pm8921_charger_init(void)
+{
+	test_power_monitor =
+		(get_kernel_flag() & KERNEL_FLAG_TEST_PWR_SUPPLY) ? 1 : 0;
+	flag_keep_charge_on =
+		(get_kernel_flag() & KERNEL_FLAG_KEEP_CHARG_ON) ? 1 : 0;
+	flag_pa_recharge =
+		(get_kernel_flag() & KERNEL_FLAG_PA_RECHARG_TEST) ? 1 : 0;
+	flag_disable_wakelock =
+		(get_kernel_flag() & KERNEL_FLAG_DISABLE_WAKELOCK) ? 1 : 0;
+	flag_enable_BMS_Charger_log =
+               (get_kernel_flag() & KERNEL_FLAG_ENABLE_BMS_CHARGER_LOG) ? 1 : 0;
+	return platform_driver_register(&pm8921_charger_driver);
+}
+
+static void __exit pm8921_charger_exit(void)
+{
+	platform_driver_unregister(&pm8921_charger_driver);
+}
+
+late_initcall(pm8921_charger_init);
+module_exit(pm8921_charger_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("PMIC8921 charger/battery driver");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("platform:" PM8921_CHARGER_DEV_NAME);
diff --git a/include/linux/mfd/pm8xxx/pm8921-bms-htc.h b/include/linux/mfd/pm8xxx/pm8921-bms-htc.h
new file mode 100644
index 0000000..d38ecbe
--- /dev/null
+++ b/include/linux/mfd/pm8xxx/pm8921-bms-htc.h
@@ -0,0 +1,186 @@
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#ifndef __PM8XXX_BMS_H
+#define __PM8XXX_BMS_H
+
+#include <linux/errno.h>
+
+#define PM8921_BMS_DEV_NAME	"pm8921-bms"
+
+#define FCC_CC_COLS		5
+#define FCC_TEMP_COLS		8
+
+#define PC_CC_ROWS             29
+#define PC_CC_COLS             13
+
+#define PC_TEMP_ROWS		29
+#define PC_TEMP_COLS		8
+
+#define MAX_SINGLE_LUT_COLS	20
+
+struct single_row_lut {
+	int x[MAX_SINGLE_LUT_COLS];
+	int y[MAX_SINGLE_LUT_COLS];
+	int cols;
+};
+
+struct sf_lut {
+	int rows;
+	int cols;
+	int row_entries[PC_CC_COLS];
+	int percent[PC_CC_ROWS];
+	int sf[PC_CC_ROWS][PC_CC_COLS];
+};
+
+struct pc_temp_ocv_lut {
+	int rows;
+	int cols;
+	int temp[PC_TEMP_COLS];
+	int percent[PC_TEMP_ROWS];
+	int ocv[PC_TEMP_ROWS][PC_TEMP_COLS];
+};
+
+struct pm8921_bms_battery_data {
+	unsigned int		fcc;
+	struct single_row_lut	*fcc_temp_lut;
+	struct single_row_lut	*fcc_sf_lut;
+	struct pc_temp_ocv_lut	*pc_temp_ocv_lut;
+	struct sf_lut		*pc_sf_lut;
+	struct sf_lut		*rbatt_sf_lut;
+	int			default_rbatt_mohm;
+	int			delta_rbatt_mohm;
+};
+
+struct pm8xxx_bms_core_data {
+	unsigned int	batt_temp_channel;
+	unsigned int	vbat_channel;
+	unsigned int	ref625mv_channel;
+	unsigned int	ref1p25v_channel;
+	unsigned int	batt_id_channel;
+};
+
+enum battery_type {
+	BATT_UNKNOWN = 0,
+	BATT_PALLADIUM,
+	BATT_DESAY,
+};
+
+struct pm8921_bms_platform_data {
+	struct pm8xxx_bms_core_data	bms_cdata;
+	enum battery_type		battery_type;
+	unsigned int			r_sense;
+	unsigned int			i_test;
+	unsigned int			v_failure;
+	unsigned int			max_voltage_uv;
+	unsigned int			rconn_mohm;
+	int				enable_fcc_learning;
+};
+
+#if defined(CONFIG_PM8921_BMS) || defined(CONFIG_PM8921_BMS_MODULE)
+extern struct pm8921_bms_battery_data  palladium_1500_data;
+extern struct pm8921_bms_battery_data  desay_5200_data;
+int pm8921_bms_get_vsense_avg(int *result);
+
+int pm8921_bms_get_battery_current(int *result);
+
+int pm8921_bms_get_percent_charge(void);
+
+int pm8921_bms_get_fcc(void);
+
+int pm8921_bms_charging_began(void);
+void pm8921_bms_charging_end(int is_battery_full);
+
+void pm8921_bms_calibrate_hkadc(void);
+int pm8921_bms_stop_ocv_updates(void);
+int pm8921_bms_start_ocv_updates(void);
+int pm8921_bms_get_simultaneous_battery_voltage_and_current(int *ibat_ua,
+								int *vbat_uv);
+int pm8921_bms_get_rbatt(void);
+void pm8921_bms_invalidate_shutdown_soc(void);
+int pm8921_bms_dump_all(void);
+#ifdef CONFIG_HTC_BATT_8960
+int pm8921_bms_get_batt_current(int *result);
+
+int pm8921_bms_get_batt_soc(int *result);
+int pm8921_bms_get_batt_cc(int *result);
+int pm8921_bms_get_attr_text(char *buf, int size);
+#endif 
+#else
+static inline int pm8921_bms_get_vsense_avg(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_bms_get_battery_current(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_bms_get_percent_charge(void)
+{
+	return -ENXIO;
+}
+static inline int pm8921_bms_get_fcc(void)
+{
+	return -ENXIO;
+}
+static inline void pm8921_bms_charging_began(void)
+{
+}
+static inline void pm8921_bms_charging_end(int is_battery_full)
+{
+}
+static inline void pm8921_bms_calibrate_hkadc(void)
+{
+}
+static inline void pm8921_bms_stop_ocv_updates(void)
+{
+}
+static inline void pm8921_bms_start_ocv_updates(void)
+{
+}
+static inline int pm8921_bms_get_simultaneous_battery_voltage_and_current(
+						int *ibat_ua, int *vbat_uv)
+{
+	return -ENXIO;
+}
+static inline int pm8921_bms_get_rbatt(void)
+{
+	return -EINVAL;
+}
+static inline void pm8921_bms_invalidate_shutdown_soc(void)
+{
+}
+static inline int pm8921_bms_dump_all(void)
+{
+	return -ENXIO;
+}
+#ifdef CONFIG_HTC_BATT_8960
+static inline int pm8921_bms_get_batt_current(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_bms_get_batt_soc(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_bms_get_batt_cc(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_bms_get_attr_text(char *buf, int size)
+{
+	return 0;
+}
+#endif 
+#endif
+
+#endif
diff --git a/include/linux/mfd/pm8xxx/pm8921-charger-htc.h b/include/linux/mfd/pm8xxx/pm8921-charger-htc.h
new file mode 100644
index 0000000..f4151cb
--- /dev/null
+++ b/include/linux/mfd/pm8xxx/pm8921-charger-htc.h
@@ -0,0 +1,354 @@
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#ifndef __PM8XXX_CHARGER_H
+#define __PM8XXX_CHARGER_H
+
+#include <linux/errno.h>
+#include <linux/power_supply.h>
+#ifdef CONFIG_HTC_BATT_8960
+#include <mach/htc_charger.h>
+#endif
+
+#define PM8921_CHARGER_DEV_NAME	"pm8921-charger"
+
+struct pm8xxx_charger_core_data {
+	unsigned int	vbat_channel;
+	unsigned int	batt_temp_channel;
+	unsigned int	batt_id_channel;
+};
+
+enum pm8921_chg_cold_thr {
+	PM_SMBC_BATT_TEMP_COLD_THR__LOW,
+	PM_SMBC_BATT_TEMP_COLD_THR__HIGH
+};
+
+enum pm8921_chg_hot_thr	{
+	PM_SMBC_BATT_TEMP_HOT_THR__LOW,
+	PM_SMBC_BATT_TEMP_HOT_THR__HIGH
+};
+
+enum pm8921_usb_ov_threshold {
+	PM_USB_OV_5P5V,
+	PM_USB_OV_6V,
+	PM_USB_OV_6P5V,
+	PM_USB_OV_7V,
+};
+
+enum pm8921_usb_debounce_time {
+	PM_USB_BYPASS_DEBOUNCER,
+	PM_USB_DEBOUNCE_20P5MS,
+	PM_USB_DEBOUNCE_40P5MS,
+	PM_USB_DEBOUNCE_80P5MS,
+};
+
+enum pm8921_chg_led_src_config {
+	LED_SRC_GND,
+	LED_SRC_VPH_PWR,
+	LED_SRC_5V,
+	LED_SRC_MIN_VPH_5V,
+	LED_SRC_BYPASS,
+};
+
+
+struct ext_usb_chg_pm8921 {
+	const char	*name;
+	void		*ctx;
+	int		(*start_charging) (void *ctx);
+	int		(*stop_charging) (void *ctx);
+	bool		(*is_trickle) (void *ctx);
+	struct htc_charger	*ichg;
+};
+
+
+struct pm8921_charger_platform_data {
+	struct pm8xxx_charger_core_data	charger_cdata;
+	unsigned int			safety_time;
+	unsigned int			ttrkl_time;
+	unsigned int			update_time;
+	unsigned int			max_voltage;
+	unsigned int			min_voltage;
+	unsigned int			resume_voltage_delta;
+	unsigned int			term_current;
+	int				cool_temp;
+	int				warm_temp;
+	unsigned int			temp_check_period;
+	unsigned int			max_bat_chg_current;
+	unsigned int			cool_bat_chg_current;
+	unsigned int			warm_bat_chg_current;
+	unsigned int			cool_bat_voltage;
+	unsigned int			warm_bat_voltage;
+	unsigned int			(*get_batt_capacity_percent) (void);
+	int64_t				batt_id_min;
+	int64_t				batt_id_max;
+	bool				keep_btm_on_suspend;
+	bool				dc_unplug_check;
+	int				trkl_voltage;
+	int				weak_voltage;
+	int				trkl_current;
+	int				weak_current;
+	int				vin_min;
+	int				*thermal_mitigation;
+	int				thermal_levels;
+	int				mbat_in_gpio;
+	int				is_embeded_batt;
+	enum pm8921_chg_cold_thr	cold_thr;
+	enum pm8921_chg_hot_thr		hot_thr;
+	int				rconn_mohm;
+	enum pm8921_chg_led_src_config	led_src_config;
+	struct ext_usb_chg_pm8921	*ext_usb;
+};
+
+enum pm8921_charger_source {
+	PM8921_CHG_SRC_NONE,
+	PM8921_CHG_SRC_USB,
+	PM8921_CHG_SRC_DC,
+};
+
+struct ext_chg_pm8921 {
+	const char	*name;
+	void		*ctx;
+	int		(*start_charging) (void *ctx);
+	int		(*stop_charging) (void *ctx);
+	bool		(*is_trickle) (void *ctx);
+};
+
+#ifdef CONFIG_HTC_BATT_8960
+struct pm8921_charger_batt_param {
+	unsigned int max_voltage;
+	unsigned int cool_bat_voltage;
+	unsigned int warm_bat_voltage;
+};
+#endif 
+
+#if defined(CONFIG_PM8921_CHARGER) || defined(CONFIG_PM8921_CHARGER_MODULE)
+void pm8921_charger_vbus_draw(unsigned int mA);
+int pm8921_charger_register_vbus_sn(void (*callback)(int));
+void pm8921_charger_unregister_vbus_sn(void (*callback)(int));
+int pm8921_charger_enable(bool enable);
+
+int pm8921_is_usb_chg_plugged_in(void);
+
+int pm8921_is_dc_chg_plugged_in(void);
+
+int pm8921_is_pwr_src_plugged_in(void);
+
+int pm8921_is_battery_present(void);
+
+int pm8921_set_max_battery_charge_current(int ma);
+
+int pm8921_disable_input_current_limit(bool disable);
+
+
+int pm8921_set_usb_power_supply_type(enum power_supply_type type);
+
+int pm8921_disable_source_current(bool disable);
+
+int pm8921_regulate_input_voltage(int voltage);
+bool pm8921_is_battery_charging(int *source);
+
+int pm8921_batt_temperature(void);
+int register_external_dc_charger(struct ext_chg_pm8921 *ext);
+
+void unregister_external_dc_charger(struct ext_chg_pm8921 *ext);
+
+int pm8921_usb_ovp_set_threshold(enum pm8921_usb_ov_threshold ov);
+
+int pm8921_usb_ovp_set_hystersis(enum pm8921_usb_debounce_time ms);
+
+int pm8921_usb_ovp_disable(int disable);
+
+#ifdef CONFIG_HTC_BATT_8960
+int pm8921_get_batt_voltage(int *result);
+
+int pm8921_get_batt_temperature(int *result);
+
+int pm8921_get_batt_id(int *result);
+
+int pm8921_is_batt_temperature_fault(int *result);
+
+int pm8921_is_batt_temp_fault_disable_chg(int *result);
+
+int pm8921_is_batt_full(int *result);
+
+int pm8921_get_charging_source(int *result);
+
+int pm8921_get_charging_enabled(int *result);
+
+int pm8921_pwrsrc_enable(bool enable);
+
+int pm8921_set_pwrsrc_and_charger_enable(enum htc_power_source_type src,
+		bool chg_enable, bool pwrsrc_enable);
+
+int pm8921_limit_charge_enable(bool enable);
+
+int pm8921_is_charger_ovp(int *result);
+
+int pm8921_dump_all(void);
+
+int pm8921_charger_get_attr_text(char *buf, int size);
+
+int pm8921_charger_get_attr_text_with_ext_charger(char *buf, int size);
+
+int pm8921_gauge_get_attr_text(char *buf, int size);
+#endif 
+void pm8921_chg_disable_usbin_valid_irq(void);
+void pm8921_chg_enable_usbin_valid_irq(void);
+#else
+static inline void pm8921_charger_vbus_draw(unsigned int mA)
+{
+}
+static inline int pm8921_charger_register_vbus_sn(void (*callback)(int))
+{
+	return -ENXIO;
+}
+static inline void pm8921_charger_unregister_vbus_sn(void (*callback)(int))
+{
+}
+static inline int pm8921_charger_enable(bool enable)
+{
+	return -ENXIO;
+}
+static inline int pm8921_is_usb_chg_plugged_in(void)
+{
+	return -ENXIO;
+}
+static inline int pm8921_is_dc_chg_plugged_in(void)
+{
+	return -ENXIO;
+}
+static inline int pm8921_is_pwr_src_plugged_in(void)
+{
+	return -ENXIO;
+}
+static inline int pm8921_is_battery_present(void)
+{
+	return -ENXIO;
+}
+static inline int pm8921_disable_input_current_limit(bool disable)
+{
+	return -ENXIO;
+}
+static inline int pm8921_set_usb_power_supply_type(enum power_supply_type type)
+{
+	return -ENXIO;
+}
+static inline int pm8921_set_max_battery_charge_current(int ma)
+{
+	return -ENXIO;
+}
+static inline int pm8921_disable_source_current(bool disable)
+{
+	return -ENXIO;
+}
+static inline int pm8921_regulate_input_voltage(int voltage)
+{
+	return -ENXIO;
+}
+static inline bool pm8921_is_battery_charging(int *source)
+{
+	*source = PM8921_CHG_SRC_NONE;
+	return 0;
+}
+static inline int pm8921_batt_temperature(void)
+{
+	return -ENXIO;
+}
+static inline int register_external_dc_charger(struct ext_chg_pm8921 *ext)
+{
+	pr_err("%s.not implemented.\n", __func__);
+	return -ENODEV;
+}
+static inline void unregister_external_dc_charger(struct ext_chg_pm8921 *ext)
+{
+	pr_err("%s.not implemented.\n", __func__);
+}
+static inline int pm8921_usb_ovp_set_threshold(enum pm8921_usb_ov_threshold ov)
+{
+	return -ENXIO;
+}
+static inline int pm8921_usb_ovp_set_hystersis(enum pm8921_usb_debounce_time ms)
+{
+	return -ENXIO;
+}
+static inline int pm8921_usb_ovp_disable(int disable)
+{
+	return -ENXIO;
+}
+#ifdef CONFIG_HTC_BATT_8960
+static inline int pm8921_get_batt_voltage(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_get_batt_temperature(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_get_batt_id(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_is_batt_temperature_fault(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_is_batt_temp_fault_disable_chg(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_is_batt_full(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_get_charging_source(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_get_charging_enabled(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_pwrsrc_enable(bool enable)
+{
+	return -ENXIO;
+}
+static inline int pm8921_set_pwrsrc_and_charger_enable(enum htc_power_source_type src,
+		bool chg_enable, bool pwrsrc_enable)
+{
+	return -ENXIO;
+}
+static inline int pm8921_limit_charge_enable(bool enable)
+{
+	return -ENXIO;
+}
+static inline int pm8921_is_charger_ovp(int *result)
+{
+	return -ENXIO;
+}
+static inline int pm8921_charger_get_attr_text(char *buf, int size)
+{
+	return -ENXIO;
+}
+static inline int pm8921_gauge_get_attr_text(char *buf, int size)
+{
+	return -ENXIO;
+}
+#endif 
+static inline void pm8921_chg_disable_usbin_valid_irq(void)
+{
+}
+static inline void pm8921_chg_enable_usbin_valid_irq(void)
+{
+}
+#endif
+
+#endif
diff --git a/include/linux/mfd/pm8xxx/pm8921.h b/include/linux/mfd/pm8xxx/pm8921.h
index aabbb21..d9710ca 100644
--- a/include/linux/mfd/pm8xxx/pm8921.h
+++ b/include/linux/mfd/pm8xxx/pm8921.h
@@ -29,10 +29,16 @@
 #include <linux/input/pmic8xxx-pwrkey.h>
 #include <linux/input/pmic8xxx-keypad.h>
 #include <linux/regulator/pm8xxx-regulator.h>
-#include <linux/mfd/pm8xxx/pm8921-charger.h>
 #include <linux/mfd/pm8xxx/pm8xxx-adc.h>
+#ifdef CONFIG_HTC_BATT_8960
+#include <linux/mfd/pm8xxx/pm8921-charger-htc.h>
+#include <linux/mfd/pm8xxx/pm8921-bms-htc.h>
+#include <linux/leds-pm8xxx-htc.h>
+#else
+#include <linux/mfd/pm8xxx/pm8921-charger.h>
 #include <linux/mfd/pm8xxx/pm8921-bms.h>
 #include <linux/leds-pm8xxx.h>
+#endif
 #include <linux/mfd/pm8xxx/vibrator.h>
 #include <linux/mfd/pm8xxx/ccadc.h>
 
diff --git a/include/linux/smb349.h b/include/linux/smb349.h
new file mode 100644
index 0000000..9189358
--- /dev/null
+++ b/include/linux/smb349.h
@@ -0,0 +1,377 @@
+/* Copyright (c) 2012 Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ *
+ */
+#ifndef __SMB349_H__
+#define __SMB349_H__
+
+#ifdef CONFIG_HTC_BATT_8960
+#include <mach/htc_charger.h>
+#endif
+
+#define SMB_CHG_CURR_REG			0x00
+#define CHG_OTHER_CURRENT_REG		0x01
+#define VAR_FUNC_REG			0x02
+#define FLOAT_VOLTAGE_REG		0x03
+#define CHG_CTRL_REG			0x04
+#define STAT_TIMER_REG			0x05
+#define PIN_ENABLE_CTRL_REG		0x06
+#define THERM_CTRL_A_REG		0x07
+#define SYSOK_USB3_SEL_REG		0x08
+#define CTRL_FUNC_REG		0x09
+#define OTG_TLIM_THERM_CNTRL_REG	0x0A
+#define LIMIT_CELL_TEMP_MONI_REG 0x0B
+#define FAULT_IRQ_REG				0x0C
+#define STATUS_IRQ_REG				0x0D
+#define SYSOK_REG				0x0E
+#define AUTO_INPUT_VOL_DET_REG		0x10
+#define I2C_BUS_REG				0x12
+#define CMD_A_REG				0x30
+#define CMD_B_REG				0x31
+#define CMD_C_REG				0x33
+#define IRQ_A_REG				0x35
+#define IRQ_B_REG				0x36
+#define IRQ_C_REG				0x37
+#define IRQ_D_REG				0x38
+#define IRQ_E_REG				0x39
+#define IRQ_F_REG				0x3A
+#define STATUS_A_REG				0x3B
+#define STATUS_B_REG				0x3C
+#define STATUS_C_REG				0x3D
+#define STATUS_D_REG				0x3E
+#define STATUS_E_REG				0x3F
+
+#define CHG_STATUS_MASK		SMB349_MASK(2, 1)
+#define CHG_ENABLE_STATUS_BIT		BIT(0)
+
+#define FAST_CHG_CURRENT_MASK			SMB349_MASK(4, 4)
+
+
+#define SUSPEND_MODE_MASK				SMB349_MASK(1, 2)
+
+#define CHARGING_ENABLE_MASK				SMB349_MASK(1, 1)
+#define VOLIATILE_WRITE_PERMISSIOIN_MASK		SMB349_MASK(1, 7)
+#define CURRENT_TERMINATION_MASK			SMB349_MASK(1, 6)
+
+#define OTG_ENABLE_MASK				SMB349_MASK(1, 4)
+#define AICL_MASK				SMB349_MASK(1, 4)
+#define USBCS_MASK				SMB349_MASK(1, 4)
+
+#define AC_INPUT_CURRENT_LIMIT_MASK		SMB349_MASK(4, 0)
+#define DC_INPUT_CURRENT_LIMIT_MASK		SMB349_MASK(4, 0)
+
+#define PRE_CHG_CURRENT_MASK			SMB349_MASK(3, 5)
+
+#define USB_HC_MODE_MASK			SMB349_MASK(1, 0)
+#define TERMINATION_CURRENT_MASK		SMB349_MASK(3, 2)
+
+#define USB_1_5_MODE_MASK			SMB349_MASK(1, 1)
+
+#define IS_SUSPEND_MODE_MASK			SMB349_MASK(1, 7)
+
+#define OTG_CURRENT_MASK			SMB349_MASK(2, 2)
+
+
+#define PIN_CONTROL_ACTIVE_MASK			SMB349_MASK(2, 5)
+
+#define PRE_CHG_TO_FAST_CHG_THRESH_MASK		SMB349_MASK(2, 6)
+#define SWITCH_FREQ_MASK			SMB349_MASK(2, 6)
+#define OTG_I2C_PIN_MASK			SMB349_MASK(2, 6)
+
+#define PRE_CHG_TO_FAST_CHG_ENABLE_MASK		SMB349_MASK(1, 1)
+#define FLOAT_VOLTAGE_MASK			SMB349_MASK(6, 0)
+
+
+#define SUSPEND_MODE_BIT			BIT(2)
+#define CHG_ENABLE_BIT				BIT(1)
+#define VOLATILE_W_PERM_BIT			BIT(7)
+#define USB_SELECTION_BIT			BIT(1)
+#define SYSTEM_FET_ENABLE_BIT			BIT(7)
+#define AICL_COMPLETE_STATUS_BIT		BIT(4)
+#define AUTOMATIC_INPUT_CURR_LIMIT_BIT		BIT(4)
+#define I2C_CONTROL_CHARGER_BIT			BIT(5)
+#define AUTOMATIC_POWER_SOURCE_DETECTION_BIT	BIT(2)
+#define BATT_OV_END_CHG_BIT			BIT(1)
+#define VCHG_FUNCTION				BIT(0)
+#define USB_1_5_MODE				BIT(1)
+#define USB_HC_MODE				BIT(0)
+#define POWER_OK_STATUS				BIT(0)
+#define USBCS_PIN_MODE				BIT(4)
+#define USBCS_REGISTER_MODE			0
+#define CURR_TERM_END_CHG_BIT			BIT(6)
+
+#define SMB349_HOT_TEMPERATURE_HARD_LIMIT_IRQ			7
+#define SMB349_HOT_TEMPERATURE_HARD_LIMIT_STATUS                6
+#define SMB349_COLD_TEMPERATURE_HARD_LIMIT_IRQ                  5
+#define SMB349_COLD_TEMPERATURE_HARD_LIMIT_STATUS               4
+#define SMB349_HOT_TEMPERATURE_SOFT_LIMIT_IRQ                   3
+#define SMB349_HOT_TEMPERATURE_SOFT_LIMIT_STATUS                2
+#define SMB349_COLD_TEMPERATURE_SOFT_LIMIT_IRQ                  1
+#define SMB349_COLD_TEMPERATURE_SOFT_LIMIT_STATUS               0
+
+#define SMB349_BATTERY_OVER_VOLTAGE_CONDITION_IRQ		7
+#define SMB349_BATTERY_OVER_VOLTAGE_STATUS			6
+#define SMB349_MISSING_BATTER_IRQ                               5
+#define SMB349_MISSING_BATTERY_STATUS                           4
+#define SMB349_LOW_BATTERY_VOLTAGE_IRQ                          3
+#define SMB349_LOW_BATTERY_VOLTAGE_STATUS                       2
+#define SMB349_PRE_TO_FAST_CHARGE_BATTERY_VOLTAGE_IRQ           1
+#define SMB349_PRE_TO_FAST_CHARGE_BATTERY_VOLTAGE_STATUS        0
+
+#define SMB349_INTERNAL_TEMPERATURE_LIMIT_IRQ			7
+#define SMB349_INTERNAL_TEMPERATURE_LIMIT_STATUS                6
+#define SMB349_RE_CHARGE_BATTERY_THRESHOLD_IRQ                  5
+#define SMB349_RE_CHARGE_BATTERY_THRESHOLD_STATUS               4
+#define SMB349_TAPER_CHARGING_MODE_IRQ                          3
+#define SMB349_TAPER_CHARGING_MODE_STATUS                       2
+#define SMB349_TERMINATION_CHARGING_CURRENT_HIT_IRQ             1
+#define SMB349_TERMINATION_CHARGING_CURRENT_HIT_STATUS          0
+
+#define SMB349_APSD_COMPLETED_IRQ				7
+#define SMB349_APSD_COMPLETED_STATUS                            6
+#define SMB349_AICL_COMPLETE_IRQ                                5
+#define SMB349_AICL_COMPLETE_STATUS                             4
+#define SMB349_RESERVED_3                                         3
+#define SMB349_RESERVED_2                                         2
+#define SMB349_CHARGE_TIMEOUT_IRQ                               1
+#define SMB349_CHARGE_TIMEOUT_STATUS                            0
+
+
+#define SMB349_CIN_OVER_VOLTAGE_IRQ				7
+#define SMB349_DCIN_OVER_VOLTAGE_STATUS				6
+#define SMB349_DCIN_UNDER_VOLTAGE_IRQ				5
+#define SMB349_DCIN_UNDER_VOLTAGE_STATUS			4
+#define SMB349_AFVC_ACTIVE_IRQ					3
+#define SMB349_AFVC_ACTIVE_STATUS				2
+
+#define SMB349_OTG_OVER_CURRENT_LIMIT_IRQ			7
+#define SMB349_OTG_OVER_CURRENT_LIMIT_STATUS            	6
+#define SMB349_OTG_BATTERY_UNDER_VOLTAGE_IRQ            	5
+#define SMB349_OTG_BATTERY_UNDER_VOLTAGE_STATUS         	4
+#define SMB349_OTG_DETECTION_IRQ                        	3
+#define SMB349_OTG_DETECTION_STATUS                     	2
+#define SMB349_POWER_OK_IRQ					1
+#define SMB349_POWER_OK_STATUS					0
+
+
+#define SMB349_FAST_CHG_MIN_MA	1000
+#define SMB349_FAST_CHG_STEP_MA	200
+#define SMB349_FAST_CHG_MAX_MA	4000
+#define SMB349_FAST_CHG_SHIFT	4
+#define SMB349_PRE_CHG_SHIFT	5
+
+#define SMB349_OTG_I2C_PIN_SHIFT	6
+
+#define SMB349_OTG_I2C_CONTROL		0x0
+#define SMB349_OTG_PIN_CONTROL		0x1
+
+#define SMB34X_OTG_CURR_LIMIT_SHIFT	2
+#define SMB349_SWITCH_FREQ_SHIFT	6
+
+#define SMB349_PIN_CONTROL_SHIFT	5
+#define SMB349_USBCS_REGISTER_CTRL	0
+#define SMB349_USBCS_PIN_CTRL		1
+
+#define SMB349_NO_CHARGING				0
+#define SMB349_PRE_CHARGING				1
+#define SMB349_FAST_CHARGING				2
+#define SMB349_TAPER_CHARGING				3
+
+
+
+#define	SMB349_FLOAT_VOL_4000_MV	0x1B
+#define	SMB349_FLOAT_VOL_4200_MV	0x25
+#define	SMB349_FLOAT_VOL_4220_MV	0x26
+#define	SMB349_FLOAT_VOL_4240_MV	0x27
+#define	SMB349_FLOAT_VOL_4260_MV	0x28
+#define	SMB349_FLOAT_VOL_4280_MV	0x29
+#define	SMB349_FLOAT_VOL_4300_MV	0x2A
+#define	SMB349_FLOAT_VOL_4320_MV	0x2B
+#define	SMB349_FLOAT_VOL_4340_MV	0x2C
+#define	SMB349_FLOAT_VOL_4350_MV	0x2D
+
+
+#define SMB_OTG_CURR_LIMIT_250MA		0x0
+#define SMB_OTG_CURR_LIMIT_500MA		0x1
+#define SMB_OTG_CURR_LIMIT_750MA		0x2
+#define SMB_OTG_CURR_LIMIT_1000MA		0x3
+
+
+#define SMB349_I2C_CONTROL_ACTIVE_HIGH		0x0
+#define SMB349_I2C_CONTROL_ACTIVE_LOW		0x1
+#define SMB349_PIN_CONTROL_ACTIVE_HIGH		0x2
+#define SMB349_PIN_CONTROL_ACTIVE_LOW		0x3
+
+#define		AICL_RESULT_500MA	0x0
+#define		AICL_RESULT_900MA       0x1
+#define		AICL_RESULT_1000MA      0x2
+#define		AICL_RESULT_1100MA      0x3
+#define		AICL_RESULT_1200MA      0x4
+#define		AICL_RESULT_1300MA      0x5
+#define		AICL_RESULT_1500MA      0x6
+#define		AICL_RESULT_1600MA      0x7
+#define		AICL_RESULT_1700MA      0x8
+#define		AICL_RESULT_1800MA      0x9
+#define		AICL_RESULT_2000MA      0xa
+#define		AICL_RESULT_2200MA      0xb
+#define		AICL_RESULT_2400MA      0xc
+#define		AICL_RESULT_2500MA      0xd
+#define		AICL_RESULT_3000MA      0xe
+#define		AICL_RESULT_3500MA      0xf
+
+#define		SWITCH_FREQ_750KHZ	0x0
+#define		SWITCH_FREQ_1MHZ       	0x1
+#define		SWITCH_FREQ_1D5MHZ     	0x2
+#define		SWITCH_FREQ_3MHZ       	0x3
+
+#define SMB349_USB_MODE		0
+#define SMB349_HC_MODE		1
+
+#define		FAST_CHARGE_500MA	0x0
+#define		FAST_CHARGE_600MA       0x1
+#define		FAST_CHARGE_700MA       0x2
+#define		FAST_CHARGE_800MA       0x3
+#define		FAST_CHARGE_900MA       0x4
+#define		FAST_CHARGE_1000MA      0x5
+#define		FAST_CHARGE_1100MA      0x6
+#define		FAST_CHARGE_1200MA      0x7
+#define		FAST_CHARGE_1300MA      0x8
+#define		FAST_CHARGE_1400MA      0x9
+#define		FAST_CHARGE_1500MA      0xa
+#define		FAST_CHARGE_1600MA      0xb
+#define		FAST_CHARGE_1700MA      0xc
+#define		FAST_CHARGE_1800MA      0xd
+#define		FAST_CHARGE_1900MA      0xe
+#define		FAST_CHARGE_2000MA      0xf
+
+
+#define         SMB340_FASTCHG_1000MA      0x0
+#define         SMB340_FASTCHG_1200MA      0x1
+#define         SMB340_FASTCHG_1400MA      0x2
+#define         SMB340_FASTCHG_1600MA      0x3
+#define         SMB340_FASTCHG_1800MA      0x4
+#define         SMB340_FASTCHG_2000MA      0x5
+#define         SMB340_FASTCHG_2200MA      0x6
+#define         SMB340_FASTCHG_2400MA      0x7
+#define         SMB340_FASTCHG_2600MA      0x8
+#define         SMB340_FASTCHG_2800MA      0x9
+#define         SMB340_FASTCHG_3000MA      0xa
+#define         SMB340_FASTCHG_3200MA      0xb
+#define         SMB340_FASTCHG_3400MA      0xc
+#define         SMB340_FASTCHG_3600MA      0xd
+#define         SMB340_FASTCHG_3800MA      0xe
+#define         SMB340_FASTCHG_4000MA      0xf
+
+
+
+#define		DC_INPUT_500MA		0x0
+#define		DC_INPUT_900MA		0x1
+#define		DC_INPUT_1000MA		0x2
+#define		DC_INPUT_1100MA		0x3
+#define		DC_INPUT_1200MA		0x4
+#define		DC_INPUT_1300MA		0x5
+#define		DC_INPUT_1500MA		0x6
+#define		DC_INPUT_1600MA		0x7
+#define		DC_INPUT_1700MA		0x8
+#define		DC_INPUT_1800MA		0x9
+#define		DC_INPUT_2000MA		0xa
+#define		DC_INPUT_2200MA		0xb
+#define		DC_INPUT_2400MA		0xc
+#define		DC_INPUT_2500MA		0xd
+#define		DC_INPUT_3000MA		0xe
+#define		DC_INPUT_3500MA		0xf
+
+#define		PRECHG_CURR_100MA		0x0
+#define		PRECHG_CURR_150MA		0x1
+#define		PRECHG_CURR_200MA		0x2
+#define		PRECHG_CURR_250MA		0x3
+#define		PRECHG_CURR_300MA		0x4
+#define		PRECHG_CURR_350MA		0x5
+#define		PRECHG_CURR_50MA		0x6
+
+#define         SMB340_PRECHG_CURR_200MA	0x0
+#define         SMB340_PRECHG_CURR_300MA	0x1
+#define         SMB340_PRECHG_CURR_400MA	0x2
+#define         SMB340_PRECHG_CURR_500MA	0x3
+#define         SMB340_PRECHG_CURR_600MA	0x4
+#define         SMB340_PRECHG_CURR_700MA	0x5
+#define         SMB340_PRECHG_CURR_100MA	0x6
+
+
+#define		SMB_349		1
+#define		SMB_340		2
+
+enum smb349_thermal_state {
+	STATE_HI_V_SCRN_ON = 1,
+	STATE_LO_V_SCRN_ON,
+	STATE_HI_V_SCRN_OFF,
+	STATE_LO_V_SCRN_OFF,
+};
+
+struct smb349_chg_int_notifier {
+	struct list_head notifier_link;
+	const char *name;
+	void (*func)(int int_reg, int value);
+};
+
+struct smb349_platform_data {
+	int chg_susp_gpio;
+	int chg_current_ma;
+	int chip_rev;
+#ifdef CONFIG_SUPPORT_DQ_BATTERY
+	int dq_result;
+#endif
+	int aicl_result_threshold;
+	int dc_input_max;
+};
+
+struct smb349_charger_batt_param {
+	int max_voltage;
+	int cool_bat_voltage;
+};
+int smb349_set_AICL_mode(unsigned int enable);
+int smb349_allow_fast_charging_setting(void);
+int smb349_allow_volatile_wrtting(void);
+int smb349_enable_charging(bool enable);
+int smb349_eoc_notify(enum htc_extchg_event_type main_event);
+int smb349_event_notify(enum htc_extchg_event_type extchg_event);
+int smb349_temp_notify(enum htc_extchg_event_type main_event);
+int smb349_enable_5v_output(bool mhl_in);
+int smb349_config(void);
+void smb349_dbg(void);
+int  smb349_dump_reg(u8 reg);
+void smb349_partial_reg_dump(void);
+int smb349_dump_all(void);
+int smb349_is_AICL_complete(void);
+int smb349_is_AICL_enabled(void);
+int smb349_is_charger_bit_low_active(void);
+int smb349_is_charger_error(void);
+int smb349_reset_max_chg_vol(enum htc_extchg_event_type main_event);
+int smb349_is_charging_enabled(void);
+int smb349_is_batt_temp_fault_disable_chg(int *result);
+int smb349_get_i2c_slave_id(void);
+int smb349_is_hc_mode(void);
+int smb349_is_usbcs_register_mode(void);
+int smb349_masked_write(int reg, u8 mask, u8 val);
+int smb349_not_allow_charging_cycle_end(void);
+int smb349_enable_pwrsrc(bool enable);
+int smb349_set_pwrsrc_and_charger_enable(enum htc_power_source_type src, bool chg_enable, bool pwrsrc_enable);
+int smb349_set_hc_mode(unsigned int enable);
+int smb349_switch_usbcs_mode(int mode);
+int smb349_limit_charge_enable(bool enable);
+int smb349_get_charging_src(int *result);
+int smb349_get_charging_enabled(int *result);
+int smb349_is_charger_overvoltage(int* result);
+int smb349_charger_get_attr_text(char *buf, int size);
+int smb349_start_charging(void *ctx);
+int smb349_stop_charging(void *ctx);
+bool smb349_is_trickle_charging(void *ctx);
+#endif