Merge branches 'pm-core', 'pm-domains', 'pm-sleep', 'acpi-pm' and 'pm-cpuidle'

[linux-2.6-microblaze.git] / Documentation / devicetree / bindings / power / power_domain.txt

diff --git a/Documentation/devicetree/bindings/power/power_domain.txt b/Documentation/devicetree/bindings/power/power_domain.txt
index 9b387f8..8f8b25a 100644 (file)
--- a/Documentation/devicetree/bindings/power/power_domain.txt
+++ b/Documentation/devicetree/bindings/power/power_domain.txt
@@ -114,18 +114,26 @@ Required properties:
  - power-domains : A list of PM domain specifiers, as defined by bindings of
                the power controller that is the PM domain provider.
 
+Optional properties:
+ - power-domain-names : A list of power domain name strings sorted in the same
+               order as the power-domains property. Consumers drivers will use
+               power-domain-names to match power domains with power-domains
+               specifiers.
+
 Example:
 
        leaky-device@12350000 {
                compatible = "foo,i-leak-current";
                reg = <0x12350000 0x1000>;
                power-domains = <&power 0>;
+               power-domain-names = "io";
        };
 
        leaky-device@12351000 {
                compatible = "foo,i-leak-current";
                reg = <0x12351000 0x1000>;
                power-domains = <&power 0>, <&power 1> ;
+               power-domain-names = "io", "clk";
        };
 
 The first example above defines a typical PM domain consumer device, which is
@@ -133,7 +141,7 @@ located inside a PM domain with index 0 of a power controller represented by a
 node with the label "power".
 In the second example the consumer device are partitioned across two PM domains,
 the first with index 0 and the second with index 1, of a power controller that
-is represented by a node with the label "power.
+is represented by a node with the label "power".
 
 Optional properties:
 - required-opps: This contains phandle to an OPP node in another device's OPP