From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Sep 2012 05:44:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'regulator/for-next'
X-Git-Tag: next-20120917~51
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2d38d9557211c4b4e3977dc6be72bd0f30f583ea;p=karo-tx-linux.git

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

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

2d38d9557211c4b4e3977dc6be72bd0f30f583ea
diff --cc Documentation/devicetree/bindings/regulator/tps6586x.txt
index ead89260d957,a2436e1edfc1..9b05e24b63d0
--- a/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@@ -18,12 -19,11 +19,15 @@@ Required properties
  - vinldo678-supply: The input supply for the LDO6, LDO7 and LDO8
  - vinldo9-supply: The input supply for the LDO9
  
 +Optional properties:
 +- ti,system-power-controller: Telling whether or not this pmic is controlling
 +  the system power.
 +
  Each regulator is defined using the standard binding for regulators.
  
+ Note: LDO5 and LDO_RTC is supplied by SYS regulator internally and driver
+       take care of making proper parent child relationship.
+ 
  Example:
  
  	pmu: tps6586x@34 {
@@@ -34,8 -34,7 +38,9 @@@
  		#gpio-cells = <2>;
  		gpio-controller;
  
 +		ti,system-power-controller;
 +
+ 		sys-supply = <&some_reg>;
  		vin-sm0-supply = <&some_reg>;
  		vin-sm1-supply = <&some_reg>;
  		vin-sm2-supply = <&some_reg>;