Merge remote-tracking branches 'regulator/topic/drivers', 'regulator/topic/enable...

diff --cc drivers/regulator/Kconfig
index 1344aa8,72fb950,2dc8289,2dc8289,e6b98ed,e0ee400..40eab77
--- 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
@@@@@@@ -241,6 -240,6 -240,6 -240,6 -240,16 -240,23 +241,23 @@@@@@@ config REGULATOR_GPI
          and the platform has to provide a mapping of GPIO-states
          to target volts/amps.
      
++++  config REGULATOR_HI6421
++++    tristate "HiSilicon Hi6421 PMIC voltage regulator support"
++++    depends on MFD_HI6421_PMIC && OF
++++    help
++++      This driver provides support for the voltage regulators on the
++++      HiSilicon Hi6421 PMU / Codec IC.
++++      Hi6421 is a multi-function device which, on regulator part, provides
++++      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_ISL9305
+++++   tristate "Intersil ISL9305 regulator"
+++++   depends on I2C
+++++   select REGMAP_I2C
+++++   help
+++++     This driver supports ISL9305 voltage regulator chip.
+++++ 
      config REGULATOR_ISL6271A
        tristate "Intersil ISL6271A Power regulator"
        depends on I2C

diff --cc drivers/regulator/Makefile
index aa4a6aa,a4d81ec,aa4a6aa,aa4a6aa,5513e2c,e12fee8..6628348
--- 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
@@@@@@@ -32,7 -32,7 -32,7 -32,7 -32,8 -32,9 +32,9 @@@@@@@ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) +
      obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o
      obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o
      obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o
++++  obj-$(CONFIG_REGULATOR_HI6421) += hi6421-regulator.o
      obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o
+++++ obj-$(CONFIG_REGULATOR_ISL9305) += isl9305.o
      obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
      obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o
      obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o

diff --cc drivers/regulator/core.c
Simple merge

diff --cc include/linux/regulator/driver.h
Simple merge