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

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

diff --cc drivers/regulator/Kconfig
index c3ca05cb5c871971629cf18315114c67406450c6,f6bf208f0fcaf22f18027903c4c604fe51269fd5..72fb9500f4101bcbaa36d1b2f5b9ede0fc84d9cc
--- 1/drivers/regulator/Kconfig
--- 2/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_ST_PWM
 -      tristate "STMicroelectronics PWM voltage regulator"
 -      depends on ARCH_STI
 -      help
 -       This driver supports ST's PWM controlled voltage regulators.
 -
+ 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_TI_ABB
        tristate "TI Adaptive Body Bias on-chip LDO"
        depends on ARCH_OMAP

diff --cc drivers/regulator/Makefile
index 2f49356e03a72e808b3b49d4e4efef914ec9c65a,d8206ec63d1591960d7605960cde6cbaaf3d5285..a4d81ec024eac144f765dfd643b7456a60450f18
--- 1/drivers/regulator/Makefile
--- 2/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_ST_PWM) += st-pwm.o
+ obj-$(CONFIG_REGULATOR_SKY81452) += sky81452-regulator.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