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

diff --cc drivers/regulator/Kconfig
index 1344aa83b438eeca1e3fd9c4515fbe870b2887c4,72fb9500f4101bcbaa36d1b2f5b9ede0fc84d9cc,2dc8289e5dba772be498e084505c72d89491b3fb,2dc8289e5dba772be498e084505c72d89491b3fb,e6b98ed4c12fc9f34971474754d5a350d343cf01,e0ee40054c8db0ee1e17af4bb662cefdca618739..40eab775047e41cb0bdf962752ce891fef5740e0
--- 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 aa4a6aa7b55827b4dab12789e40b97c5443ee8a0,a4d81ec024eac144f765dfd643b7456a60450f18,aa4a6aa7b55827b4dab12789e40b97c5443ee8a0,aa4a6aa7b55827b4dab12789e40b97c5443ee8a0,5513e2c141b11bff477c45fa7ce0d551970b9043,e12fee8c943ba7ab5c397a713aac2d7018d04e88..662834856c3769908f7e360258e47b78682a328e
--- 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