Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/rn5t618...

diff --cc drivers/regulator/Kconfig
index 58a6ec1253271a60984edb5b0c90c459072e4f33,fb32babf756ee92cf18eb7233552802d9801519f,ac0e6437b7b5a66b4767ef18848beb4499d1de1e,2dc8289e5dba772be498e084505c72d89491b3fb..55d7b7b0f2e011d036826111f5064c600b639d23
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
--- 3/drivers/regulator/Kconfig
--- 4/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@ -505,6 -459,16 -459,22 -459,6 +505,22 @@@@@ config REGULATOR_RC5T58
          through regulator interface. The device supports multiple DCDC/LDO
          outputs which can be controlled by i2c communication.
    
+  +config REGULATOR_RK808
+  +    tristate "Rockchip RK808 Power regulators"
+  +    depends on MFD_RK808
+  +    help
+  +      Select this option to enable the power regulator of ROCKCHIP
+  +      PMIC RK808.
+  +      This driver supports the control of different power rails of device
+  +      through regulator interface. The device supports multiple DCDC/LDO
+  +      outputs which can be controlled by i2c communication.
+  +
++ +config REGULATOR_RN5T618
++ +    tristate "Ricoh RN5T618 voltage regulators"
++ +    depends on MFD_RN5T618
++ +    help
++ +      Say y here to support the regulators found on Ricoh RN5T618 PMIC.
++ +
    config REGULATOR_S2MPA01
        tristate "Samsung S2MPA01 voltage regulator"
        depends on MFD_SEC_CORE

diff --cc drivers/regulator/Makefile
index f0e227d4f5a5ea11643cd389a5792289a3a54fff,236fdbb2b78621ade423b854c9e9c2a4a651eb95,3b767c60d76b3b0ab4d484474b2b3824d2df1444,aa4a6aa7b55827b4dab12789e40b97c5443ee8a0..1029ed39c5124b3fd95e3203abe7448da4b0c501
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
--- 3/drivers/regulator/Makefile
--- 4/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@ -67,6 -62,7 -62,8 -62,6 +67,8 @@@@@ obj-$(CONFIG_REGULATOR_PBIAS) += pbias-
    obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
    obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
    obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
+  +obj-$(CONFIG_REGULATOR_RK808)   += rk808-regulator.o
++ +obj-$(CONFIG_REGULATOR_RN5T618) += rn5t618-regulator.o
    obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o
    obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
    obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o