Merge changes I8d6e42d2,I0d48f033 into msm-3.0

* changes:
  mfd: pm8038-core: add pm8xxx-regulator device configuration data
  mfd: pm8921-core: use pm8xxx-regulator instead of pm8921-regulator