Revert "power: pm8921-bms: fix approach fcc"

This reverts commit 91ea3e819a61d9688ee50d714369d4292e4af1ae.

Change-Id: Ie1fca2f06b7a170e82527cab0772204dc598be94
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-bms: account for capacitive drop"

This reverts commit 507b777833316b1fdf2737f2e6303590fbe1072b.

Change-Id: Ia82535f12e21652cc09e54f88cc71c48eba92e57
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-bms: Add connector resistance"

This reverts commit e68b55635123430a565be4ba205bb865a6123a86.

Change-Id: Ic6953861ae921da866c2c2dc7eaeeaf489009e51
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-bms: fix the units of batt_temp for rbatt"

This reverts commit b502588b4b00d0c7df3411c43f56336f7217ab2e.

Change-Id: I9439098e6c9fe6339879508376471a4a468a3294
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-bms: scale rbatt with temperature and soc"

This reverts commit 3e68b5c3de6eb200aaa8229bc21a3672689fa98d.

Conflicts:

	drivers/power/pm8921-bms.c

Change-Id: Iefa8df0d80c97cb0ee895ec1a93a6716454ae37e
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "USB: OTG: remove pm8921_set_usb_power_supply_type"

This reverts commit b2c09a1d3f2341719d499c3b3e62fbd5c6fde8b2.

Change-Id: Ia34006a56f6ca62729cd1f1da4ca8b625b40f1e7
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "usb: otg: Add support for power supply API for USB charging"

This reverts commit 1155aebf241ff2ad6efbbe4aed9b1e666dbb9eb6.

Change-Id: I79b405bbc3570c68ff0e762d5ff8ac4e257de939
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-charger: remove set_usb_power_supply_type"

This reverts commit dc2446101434158352bc48b94082118ee234b058.

Change-Id: Ib36a55656f9b42c290cf8fa4bcd7114c5830798e
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-charger: add adaptive current limiting"

This reverts commit 2c212c407b8bf7ff47952188d6d772b730c9fe73.

Change-Id: I9ab866a9043af49cbfbcf5747f85aa871c9b03f9
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-charger: remove obsolete wakelock"

This reverts commit aa86cdbbb91557fd1995cfd33f8e2c068db4121f.

Change-Id: Iaa4f9d418e7ad0ff666ac22196356e5db84cf063
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-charger: calibrate hkadc upon insertion/removal"

This reverts commit 0923befd93b02e9c80d4cafe12da9479e0abd227.

Change-Id: I66837fe3490f9470e2a85e3f8af9117ab0d01c07
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-charger: implement ir compensation"

This reverts commit efe22ff6bb1eb3ef5444d989957d15d305d23aa7.

Change-Id: I5e371ab29edd6d1eb89aa495eabf7d402469410b
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-charger: do not report usb present while in otg"

This reverts commit 6e34c4cfb6364d33a07d4e5ec429c99bf0cfd8f1.

Change-Id: Iff7034155a66d0c73f183ecd453054705f2d2342
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-charger: reset chg failed bit regularly"

This reverts commit a991ef7cd23b85ad0fba3b5bfd0cf7918266a828.

Change-Id: I6a98071011fcbfcf5a5d270a1462fc6f9904b297
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: pm8921-bms: add delta param to bms"

This reverts commit 4ff78309f0a7f87206297cc592312f76fa592030.

Conflicts:

	drivers/power/pm8921-bms.c

Change-Id: Id8e7f4b29a147c95fd680d7acaeee22805418030
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: bms: split battery data for different battery"

This reverts commit 2acb77dc22f09d569de3a20c22c17bd36868b393.

Change-Id: I1664cceafe6e8bda9a96eb30b38ac7392f39fd2f
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "msm: 8960/8064: robust battery detection"

This reverts commit 092071175267c5348e6fb014e159f717f48aeaa5.

Change-Id: I4d0d1b3fd51c7f022c020f86ca3f9e4d63e6db89
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Revert "power: bms: add desay calibration data"

This reverts commit c9ff4c5afcce385453daed2de8cd567ed59b4704.

Change-Id: Iaaae8c9060d78383f92ac9e11dcf7a542a49538e
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
Merge commit 'v3.0.31' into android-3.0
Revert "msm:kgsl: set state as requested state when in NAP"

This reverts commit 345ea590c7208f1d98372e5cecec5b608af4eaa9.

Change-Id: Icb8f083670b2823502f65304dae0fbbf8457d5d0
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>