Revert "Revert "msm: kgsl: Squashed update from msm-3.4""

This reverts commit 2a18dd56295d94eeaa23520a2247b30118cf8d32.
fastcharge v1

Conflicts:

	drivers/misc/fsa9485.c
fsa9485: fastcharge v3 - fixed, finally tracked this down