From 674f2583558e3fee55f7dc0f8da92e6d3bb5e04d Mon Sep 17 00:00:00 2001
From: Rhyland Klein <rklein@nvidia.com>
Date: Mon, 1 Apr 2013 17:45:53 -0400
Subject: [PATCH] --- yaml --- r: 367532 b: refs/heads/master c:
 da1233364d51947d8c84a33e200fcfb177ee9f20 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../bindings/power_supply/power_supply.txt    | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/power_supply/power_supply.txt

diff --git a/[refs] b/[refs]
index 53f50bbf1034..33a99a6aadbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59584857be1a4b85574a595156985eba55882a7e
+refs/heads/master: da1233364d51947d8c84a33e200fcfb177ee9f20
diff --git a/trunk/Documentation/devicetree/bindings/power_supply/power_supply.txt b/trunk/Documentation/devicetree/bindings/power_supply/power_supply.txt
new file mode 100644
index 000000000000..8391bfa0edac
--- /dev/null
+++ b/trunk/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>;
+	};