Merge remote-tracking branches 'regulator/topic/pv88090', 'regulator/topic/qcom-smd...

diff --cc drivers/regulator/Kconfig
index bfa4944,5433c44,8df0b0e,8df0b0e,b45fc60,8df0b0e..3904dc0
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
--- 3/drivers/regulator/Kconfig
--- 4/drivers/regulator/Kconfig
--- 5/drivers/regulator/Kconfig
--- 6/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@@@ -514,14 -504,22 -504,6 -504,6 -504,6 -504,6 +514,22 @@@@@@@ config REGULATOR_PFUZE10
          Say y here to support the regulators found on the Freescale
          PFUZE100/PFUZE200 PMIC.
      
  ++++config REGULATOR_PV88060
  ++++  tristate "Powerventure Semiconductor PV88060 regulator"
  ++++  depends on I2C
  ++++  select REGMAP_I2C
  ++++  help
  ++++    Say y here to support the voltage regulators and convertors
  ++++    PV88060
  ++++
+ ++++config REGULATOR_PV88090
+ ++++  tristate "Powerventure Semiconductor PV88090 regulator"
+ ++++  depends on I2C
+ ++++  select REGMAP_I2C
+ ++++  help
+ ++++    Say y here to support the voltage regulators and convertors
+ ++++    on PV88090
+ ++++
      config REGULATOR_PWM
        tristate "PWM voltage regulator"
        depends on PWM

diff --cc drivers/regulator/Makefile
index 3f6a6a6,29cda9d,0f81749,0f81749,945d8ec,0f81749..980b194
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
--- 3/drivers/regulator/Makefile
--- 4/drivers/regulator/Makefile
--- 5/drivers/regulator/Makefile
--- 6/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@@@ -67,7 -66,8 -66,6 -66,6 -66,6 -66,6 +67,8 @@@@@@@ obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) +
      obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o
      obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
      obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
  ++++obj-$(CONFIG_REGULATOR_PV88060) += pv88060-regulator.o
+ ++++obj-$(CONFIG_REGULATOR_PV88090) += pv88090-regulator.o
      obj-$(CONFIG_REGULATOR_PWM) += pwm-regulator.o
      obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
      obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o