Merge "msm8960: Use new pmic type info to determine the type of pmic"