From: Mark Brown <broonie@kernel.org>
Date: Tue, 30 Sep 2014 12:50:27 +0000 (+0100)
Subject: Merge remote-tracking branches 'regulator/topic/drivers', 'regulator/topic/enable... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a81bf3c4fc391ec10696d448408c1ac83bfb6112;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge remote-tracking branches 'regulator/topic/drivers', 'regulator/topic/enable', 'regulator/topic/fan53555', 'regulator/topic/hi6421' and 'regulator/topic/isl9305' into regulator-next
---

a81bf3c4fc391ec10696d448408c1ac83bfb6112
diff --cc drivers/regulator/Kconfig
index 1344aa83b438,72fb9500f410,2dc8289e5dba,2dc8289e5dba,e6b98ed4c12f,e0ee40054c8d..40eab775047e
--- a/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 aa4a6aa7b558,a4d81ec024ea,aa4a6aa7b558,aa4a6aa7b558,5513e2c141b1,e12fee8c943b..662834856c37
--- a/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