commit a05c84327c4bf1a00be6a8b0224a0dffc997e2d7
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 02 00:17:37 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 02 00:17:36 2013 -0700
tree 092a0636a06a18a53cd58c92c779b725ce18af5e
parent 87bc27fe6adf39dcc2dde86d541aeca7e694a1a2
parent 5705894063bb2dce4402b58ddc0e598d66800c3c

Merge "power: qpnp-bms: use battery backed data registers to store soc"

drivers/power/qpnp-bms.c

diff --git a/drivers/power/qpnp-bms.c b/drivers/power/qpnp-bms.c
index ee54735..2765836 100644
--- a/drivers/power/qpnp-bms.c
+++ b/drivers/power/qpnp-bms.c
@@ -71,9 +71,9 @@
 #define BMS1_VBAT_AVG_DATA0		0x9E
 #define BMS1_VBAT_AVG_DATA1		0x9F
 /* Extra bms registers */
-#define BMS1_BMS_DATA_REG_0		0xB0
+#define SOC_STORAGE_REG			0xB0
 #define IAVG_STORAGE_REG		0xB1
-#define SOC_STORAGE_REG			0xB2
+#define BMS1_BMS_DATA_REG_2		0xB2
 #define BMS1_BMS_DATA_REG_3		0xB3
 /* IADC Channel Select */
 #define IADC1_BMS_ADC_CH_SEL_CTL	0x48