Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
[muen/linux.git] / Documentation / devicetree / bindings / thermal / thermal.txt
index 3070049bf1faa10b5024072668e7e6f51f5df7e5..ca14ba959e0d0cc6bdf1a3a1b12510af738262ba 100644 (file)
@@ -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.
@@ -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>;
                        };
                };
        };