Merge remote-tracking branches 'regulator/topic/hi6421v530', 'regulator/topic/lp8755...

diff --combined drivers/regulator/Kconfig
index 9d2222eadcfcb1567dafbcdc7ab373a68b91bb2c,78cd8d84a2cb0337120dabb652b4f9b0043731ac,48db87d6dfef4d0bc6f2037feeab7cf88c7949c5,7c34ff8a5884a78be63f5f23480db839f9edaa81,48db87d6dfef4d0bc6f2037feeab7cf88c7949c5,48db87d6dfef4d0bc6f2037feeab7cf88c7949c5..99b9362331b56ad5f7b6aae08c7c290e80c269e9
--- 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
@@@@@@@ -214,11 -214,11 -214,11 -214,11 -214,11 -214,11 +214,11 @@@@@@@ config REGULATOR_DA905
          will be called da9055-regulator.
      
      config REGULATOR_DA9062
 -----  tristate "Dialog Semiconductor DA9062 regulators"
 +++++  tristate "Dialog Semiconductor DA9061/62 regulators"
        depends on MFD_DA9062
        help
          Say y here to support the BUCKs and LDOs regulators found on
 -----    DA9062 PMICs.
 +++++    DA9061 and DA9062 PMICs.
      
          This driver can also be built as a module. If so, the module
          will be called da9062-regulator.
@@@@@@@ -296,6 -296,16 -296,6 -296,6 -296,6 -296,6 +296,16 @@@@@@@ config REGULATOR_HI642
          21 general purpose LDOs, 3 dedicated LDOs, and 5 BUCKs. All
          of them come with support to either ECO (idle) or sleep mode.
      
+ ++++config REGULATOR_HI6421V530
+ ++++  tristate "HiSilicon Hi6421v530 PMIC voltage regulator support"
+ ++++  depends on MFD_HI6421_PMIC && OF
+ ++++  help
+ ++++    This driver provides support for the voltage regulators on
+ ++++    HiSilicon Hi6421v530 PMU / Codec IC.
+ ++++    Hi6421v530 is a multi-function device which, on regulator part,
+ ++++    provides 5 general purpose LDOs, and all of them come with support
+ ++++    to either ECO (idle) or sleep mode.
+ ++++
      config REGULATOR_HI655X
        tristate "Hisilicon HI655X PMIC regulators support"
        depends on ARCH_HISI || COMPILE_TEST
@@@@@@@ -365,6 -375,6 -365,6 -365,14 -365,6 -365,6 +375,14 @@@@@@@ config REGULATOR_LP875
          chip contains six step-down DC/DC converters which can support
          9 mode multiphase configuration.
      
+++ ++config REGULATOR_LP87565
+++ ++  tristate "TI LP87565 Power regulators"
+++ ++  depends on MFD_TI_LP87565 && OF
+++ ++  help
+++ ++    This driver supports LP87565 voltage regulator chips. LP87565
+++ ++    provides four step-down converters. It supports software based
+++ ++    voltage control for different voltage domains
+++ ++
      config REGULATOR_LP8788
        tristate "TI LP8788 Power Regulators"
        depends on MFD_LP8788

diff --combined drivers/regulator/Makefile
index dc3503fb3e30c0980acc4fe850302d0e91fd20a8,36e2b750b188857166c8e974e7c1b3348d72cab7,dc3503fb3e30c0980acc4fe850302d0e91fd20a8,fee6b8cb80a87fd0cf6b917bdebf201b2ec4093b,dc3503fb3e30c0980acc4fe850302d0e91fd20a8,dc3503fb3e30c0980acc4fe850302d0e91fd20a8..95b1e86ae692ba897b3b80f2d2e6d99b70006e88
--- 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
@@@@@@@ -38,6 -38,7 -38,6 -38,6 -38,6 -38,6 +38,7 @@@@@@@ obj-$(CONFIG_REGULATOR_DB8500_PRCMU) +
      obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o
      obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o
      obj-$(CONFIG_REGULATOR_HI6421) += hi6421-regulator.o
+ ++++obj-$(CONFIG_REGULATOR_HI6421V530) += hi6421v530-regulator.o
      obj-$(CONFIG_REGULATOR_HI655X) += hi655x-regulator.o
      obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o
      obj-$(CONFIG_REGULATOR_ISL9305) += isl9305.o
@@@@@@@ -46,6 -47,6 -46,6 -46,7 -46,6 -46,6 +47,7 @@@@@@@ obj-$(CONFIG_REGULATOR_LP3971) += lp397
      obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o
      obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o
      obj-$(CONFIG_REGULATOR_LP873X) += lp873x-regulator.o
+++ ++obj-$(CONFIG_REGULATOR_LP87565) += lp87565-regulator.o
      obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o
      obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o
      obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o