From: Mark Brown <broonie@kernel.org>
Date: Sun, 28 Sep 2014 11:17:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers
X-Git-Tag: firefly_0821_release~176^2~3137^2~3^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fdaff15ae6cc8745b9b56adab0252729b476ed7e;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
---

fdaff15ae6cc8745b9b56adab0252729b476ed7e
diff --cc drivers/regulator/Kconfig
index c3ca05cb5c87,f6bf208f0fca..72fb9500f410
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -502,6 -483,23 +502,17 @@@ config REGULATOR_S5M876
  	 via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and
  	 supports DVS mode with 8bits of output voltage control.
  
+ config REGULATOR_SKY81452
+ 	tristate "Skyworks Solutions SKY81452 voltage regulator"
+ 	depends on SKY81452
+ 	help
+ 	  This driver supports Skyworks SKY81452 voltage output regulator
+ 	  via I2C bus. SKY81452 has one voltage linear regulator can be
+ 	  programmed from 4.5V to 20V.
+ 
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called sky81452-regulator.
+ 
 -config REGULATOR_ST_PWM
 -	tristate "STMicroelectronics PWM voltage regulator"
 -	depends on ARCH_STI
 -	help
 -	 This driver supports ST's PWM controlled voltage regulators.
 -
  config REGULATOR_TI_ABB
  	tristate "TI Adaptive Body Bias on-chip LDO"
  	depends on ARCH_OMAP
diff --cc drivers/regulator/Makefile
index 2f49356e03a7,d8206ec63d15..a4d81ec024ea
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -67,6 -65,8 +67,7 @@@ obj-$(CONFIG_REGULATOR_RC5T583)  += rc5
  obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o
  obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
  obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
+ obj-$(CONFIG_REGULATOR_SKY81452) += sky81452-regulator.o
 -obj-$(CONFIG_REGULATOR_ST_PWM) += st-pwm.o
  obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o
  obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
  obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o