From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 03:40:08 +0000 (+1000)
Subject: Merge remote-tracking branch 'regulator/for-next'
X-Git-Tag: next-20140530~49
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7938dbe572151c9bbd06986a31503fe1cbad951c;p=karo-tx-linux.git

Merge remote-tracking branch 'regulator/for-next'
---

7938dbe572151c9bbd06986a31503fe1cbad951c
diff --cc drivers/regulator/Kconfig
index f0cc9e6dac3a,c2fa0b4367b1..789eb46090e3
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -265,13 -272,20 +272,21 @@@ config REGULATOR_LP878
  	help
  	  This driver supports LP8788 voltage regulator chip.
  
+ config REGULATOR_LTC3589
+ 	tristate "LTC3589 8-output voltage regulator"
+ 	depends on I2C
+ 	select REGMAP_I2C
+ 	help
+ 	  This enables support for the LTC3589, LTC3589-1, and LTC3589-2
+ 	  8-output regulators controlled via I2C.
+ 
  config REGULATOR_MAX14577
 -	tristate "Maxim 14577 regulator"
 +	tristate "Maxim 14577/77836 regulator"
  	depends on MFD_MAX14577
  	help
 -	  This driver controls a Maxim 14577 regulator via I2C bus.
 -	  The regulators include safeout LDO and current regulator 'CHARGER'.
 +	  This driver controls a Maxim MAX14577/77836 regulator via I2C bus.
 +	  The MAX14577 regulators include safeout LDO and charger current
 +	  regulator. The MAX77836 has two additional LDOs.
  
  config REGULATOR_MAX1586
  	tristate "Maxim 1586/1587 voltage regulator"