Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / thermal / thermal.txt

diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
index cc553f0952c5a5e6b68da0121f9da34b19b6114a..ca14ba959e0d0cc6bdf1a3a1b12510af738262ba 100644 (file)
--- a/Documentation/devicetree/bindings/thermal/thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/thermal.txt
@@ -97,8 +97,8 @@ get assigned to trip points of the zone. The cooling devices are expected
 to be loaded in the target system.
 
 Required properties:
-- cooling-device:      A phandle of a cooling device with its specifier,
-  Type: phandle +      referring to which cooling device is used in this
+- cooling-device:      A list of phandles of cooling devices with their specifiers,
+  Type: phandle +      referring to which cooling devices are used in this
     cooling specifier  binding. In the cooling specifier, the first cell
                        is the minimum cooling state and the second cell
                        is the maximum cooling state used in this map.
@@ -152,7 +152,7 @@ Optional property:
   Elem size: one cell  the sensors listed in the thermal-sensors property.
   Elem type: signed    Coefficients defaults to 1, in case this property
                        is not specified. A simple linear polynomial is used:
-                       Z = c0 * x0 + c1 + x1 + ... + c(n-1) * x(n-1) + cn.
+                       Z = c0 * x0 + c1 * x1 + ... + c(n-1) * x(n-1) + cn.
 
                        The coefficients are ordered and they match with sensors
                        by means of sensor ID. Additional coefficients are
@@ -276,12 +276,7 @@ thermal-zones {
                        };
                        map1 {
                                trip = <&cpu_alert1>;
-                               cooling-device = <&fan0 5 THERMAL_NO_LIMIT>;
-                       };
-                       map2 {
-                               trip = <&cpu_alert1>;
-                               cooling-device =
-                                   <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                               cooling-device = <&fan0 5 THERMAL_NO_LIMIT>, <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
                        };
                };
        };