From: Mark Brown <broonie@kernel.org>
Date: Sun, 28 Sep 2014 11:14:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers
X-Git-Tag: v4.9.8~5622^2~3^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3;p=platform%2Fkernel%2Flinux-rpi3.git

Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers

Conflicts:
	drivers/regulator/Kconfig
---

d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3
diff --cc drivers/regulator/Kconfig
index 0e59754,b0ff94a..c3ca05c
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -449,18 -449,13 +449,25 @@@ config REGULATOR_PFUZE10
  	  Say y here to support the regulators found on the Freescale
  	  PFUZE100/PFUZE200 PMIC.
  
+ config REGULATOR_PWM
+ 	tristate "PWM voltage regulator"
+ 	depends on PWM
+ 	help
+ 	  This driver supports PWM controlled voltage regulators. PWM
+ 	  duty cycle can increase or decrease the voltage.
+ 
 +config REGULATOR_QCOM_RPM
 +	tristate "Qualcomm RPM regulator driver"
 +	depends on MFD_QCOM_RPM
 +	help
 +	  If you say yes to this option, support will be included for the
 +	  regulators exposed by the Resource Power Manager found in Qualcomm
 +	  8660, 8960 and 8064 based devices.
 +
 +	  Say M here if you want to include support for the regulators on the
 +	  Qualcomm RPM as a module. The module will be named
 +	  "qcom_rpm-regulator".
 +
  config REGULATOR_RC5T583
  	tristate "RICOH RC5T583 Power regulators"
  	depends on MFD_RC5T583
diff --cc drivers/regulator/Makefile
index 9c50dc6,516c36b..2f49356
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -55,9 -55,9 +55,10 @@@ obj-$(CONFIG_REGULATOR_MAX77693) += max
  obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
  obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
  obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
 +obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
  obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
  obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
+ obj-$(CONFIG_REGULATOR_PWM) += pwm-regulator.o
  obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
  obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o
  obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o