Merge branch 'linus' into core/urgent

Update with Linus tree so fixes for the same can be applied.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 23 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/power_supply/power_supply.txt b/Documentation/devicetree/bindings/power_supply/power_supply.txt
new file mode 100644
index 000000000000..8391bfa0edac
--- /dev/null
+++ b/Documentation/devicetree/bindings/power_supply/power_supply.txt
@@ -0,0 +1,23 @@
+Power Supply Core Support
+
+Optional Properties:
+ - power-supplies : This property is added to a supply in order to list the
+   devices which supply it power, referenced by their phandles.
+
+Example:
+
+        usb-charger: power@e {
+                compatible = "some,usb-charger";
+                ...
+        };
+
+        ac-charger: power@c {
+                compatible = "some,ac-charger";
+                ...
+        };
+
+        battery@b {
+                compatible = "some,battery";
+                ...
+                power-supplies = <&usb-charger>, <&ac-charger>;
+        };