Merge changes I8af03157,I8c99fcbb into msm-3.4

* changes:
  power: pm8921-charger: PMIC version check for workarounds
  power: pm8921-charger: remove old workarounds