---

yaml
---
r: 330023
b: refs/heads/master
c: 9321d52
h: refs/heads/master
i:
  330021: 0761c77
  330019: 9060ca2
  330015: b35a690
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67966e088b0c7dc926f4ce19565ebf208e18d058
+refs/heads/master: 9321d526dd731588f09508af48de50041785a26a

trunk/Documentation/devicetree/bindings/mfd/tps65910.txt

@@ -59,8 +59,6 @@ Optional properties:
   in TPS6591X datasheet)
 - ti,en-gpio-sleep: enable sleep control for gpios
   There should be 9 entries here, one for each gpio.
-- ti,system-power-controller: Telling whether or not this pmic is controlling
-  the system power.
 
 Regulator Optional properties:
 - ti,regulator-ext-sleep-control: enable external sleep
@@ -81,8 +79,6 @@ Example:
 		#interrupt-cells = <2>;
 		interrupt-controller;
 
-		ti,system-power-controller;
-
 		ti,vmbch-threshold = 0;
 		ti,vmbch2-threshold = 0;
 		ti,en-ck32k-xtal;

trunk/Documentation/devicetree/bindings/mfd/twl6040.txt

@@ -1,7 +1,7 @@
 Texas Instruments TWL6040 family
 
-The TWL6040s are 8-channel high quality low-power audio codecs providing audio,
-vibra and GPO functionality on OMAP4+ platforms.
+The TWL6040s are 8-channel high quality low-power audio codecs providing audio
+and vibra functionality on OMAP4+ platforms.
 They are connected ot the host processor via i2c for commands, McPDM for audio
 data and commands.
 
@@ -10,8 +10,6 @@ Required properties:
 - reg: must be 0x4b for i2c address
 - interrupts: twl6040 has one interrupt line connecteded to the main SoC
 - interrupt-parent: The parent interrupt controller
-- gpio-controller:
-- #gpio-cells = <1>: twl6040 provides GPO lines.
 - twl6040,audpwron-gpio: Power on GPIO line for the twl6040
 
 - vio-supply: Regulator for the twl6040 VIO supply
@@ -39,6 +37,7 @@ Example:
 &i2c1 {
 	twl6040: twl@4b {
 		compatible = "ti,twl6040";
+		reg = <0x4b>;
 
 		interrupts = <0 119 4>;
 		interrupt-parent = <&gic>;
@@ -61,5 +60,3 @@ Example:
 		};
 	};
 };
-
-/include/ "twl6040.dtsi"

trunk/Documentation/devicetree/bindings/regulator/tps6586x.txt

@@ -22,10 +22,6 @@ 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
@@ -41,8 +37,6 @@ Example:
 		#gpio-cells = <2>;
 		gpio-controller;
 
-		ti,system-power-controller;
-
 		sys-supply = <&some_reg>;
 		vin-sm0-supply = <&some_reg>;
 		vin-sm1-supply = <&some_reg>;