From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 9 Aug 2012 19:07:15 +0000 (+0100)
Subject: Merge branch 'regulator-drivers' into regulator-next
X-Git-Tag: next-20120816~42^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f110340d61197669ff5efca137278e1fef1c411d;p=karo-tx-linux.git

Merge branch 'regulator-drivers' into regulator-next

Conflicts:
	Documentation/devicetree/bindings/regulator/tps6586x.txt
---

f110340d61197669ff5efca137278e1fef1c411d
diff --cc Documentation/devicetree/bindings/regulator/tps6586x.txt
index da80c2ae0915,ec527d95a628..4d1218f836a7
--- a/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@@ -8,10 -8,11 +8,14 @@@ Required properties
  - gpio-controller: mark the device as a GPIO controller
  - regulators: list of regulators provided by this controller, must have
    property "regulator-compatible" to match their hardware counterparts:
 -  sys, sm[0-2], ldo[0-9] and ldo_rtc
 +  sm[0-2], ldo[0-9] and ldo_rtc
 +- vin-sm0-supply: The input supply for the SM0.
 +- vin-sm1-supply: The input supply for the SM1.
 +- vin-sm2-supply: The input supply for the SM2.
+ - sys-supply: The input supply for SYS.
+ - sm0-supply: The input supply for the SM0.
+ - sm1-supply: The input supply for the SM1.
+ - sm2-supply: The input supply for the SM2.
  - vinldo01-supply: The input supply for the LDO1 and LDO2
  - vinldo23-supply: The input supply for the LDO2 and LDO3
  - vinldo4-supply: The input supply for the LDO4
diff --cc drivers/regulator/tps6586x-regulator.c
index c80f0ac05e2f,31ccaa6b85ff..ce1e7cb8d513
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@@ -184,9 -200,9 +200,9 @@@ static struct tps6586x_regulator tps658
  	TPS6586X_LDO(LDO_7, "vinldo678", ldo, SUPPLYV3, 3, 3, ENC, 5, END, 5),
  	TPS6586X_LDO(LDO_8, "vinldo678", ldo, SUPPLYV2, 5, 3, ENC, 6, END, 6),
  	TPS6586X_LDO(LDO_9, "vinldo9", ldo, SUPPLYV6, 3, 3, ENE, 7, ENE, 7),
- 	TPS6586X_LDO(LDO_RTC, NULL, ldo, SUPPLYV4, 3, 3, V4, 7, V4, 7),
+ 	TPS6586X_LDO(LDO_RTC, "REG-SYS", ldo, SUPPLYV4, 3, 3, V4, 7, V4, 7),
  	TPS6586X_LDO(LDO_1, "vinldo01", dvm, SUPPLYV1, 0, 5, ENC, 1, END, 1),
 -	TPS6586X_LDO(SM_2, "sm2", sm2, SUPPLYV2, 0, 5, ENC, 7, END, 7),
 +	TPS6586X_LDO(SM_2, "vin-sm2", sm2, SUPPLYV2, 0, 5, ENC, 7, END, 7),
  
  	TPS6586X_DVM(LDO_2, "vinldo23", dvm, LDO2BV1, 0, 5, ENA, 3,
  					ENB, 3, VCC2, 6),