Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 23:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

of: thermal: Fix inconsitency between cooling-*-state and cooling-*-level

Browse Source 
The device trees in the kernel as well as the binding description in
Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt use the
cooling-{min,max}-level property.

Fix the inconsistency with the binding description in
Documentation/devicetree/bindings/thermal/thermal.txt by changing
cooling-*-state properties to cooling-*-level.

Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Punit Agrawal 2015-09-08 12:20:48 +01:00 committed by Rob Herring
parent dc4dae00d8
commit eb168b70de
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/devicetree/bindings/thermal/thermal.txt
View File

@ -55,16 +55,16 @@ of heat dissipation). For example a fan's cooling states correspond to
the different fan speeds possible. Cooling states are referred to by the different fan speeds possible. Cooling states are referred to by
single unsigned integers, where larger numbers mean greater heat single unsigned integers, where larger numbers mean greater heat
dissipation. The precise set of cooling states associated with a device dissipation. The precise set of cooling states associated with a device
(as referred to be the cooling-min-state and cooling-max-state (as referred to by the cooling-min-level and cooling-max-level
properties) should be defined in a particular device's binding. properties) should be defined in a particular device's binding.
For more examples of cooling devices, refer to the example sections below. For more examples of cooling devices, refer to the example sections below.
Required properties: Required properties:
- cooling-min-state: An integer indicating the smallest - cooling-min-level: An integer indicating the smallest
Type: unsigned cooling state accepted. Typically 0. Type: unsigned cooling state accepted. Typically 0.
Size: one cell Size: one cell
- cooling-max-state: An integer indicating the largest - cooling-max-level: An integer indicating the largest
Type: unsigned cooling state accepted. Type: unsigned cooling state accepted.
Size: one cell Size: one cell
@ -225,8 +225,8 @@ cpus {
396000 950000 396000 950000
198000 850000 198000 850000
>; >;
cooling-min-state = <0>; cooling-min-level = <0>;
cooling-max-state = <3>; cooling-max-level = <3>;
#cooling-cells = <2>; /* min followed by max */ #cooling-cells = <2>; /* min followed by max */
}; };
... ...
@ -240,8 +240,8 @@ cpus {
*/ */
fan0: fan@0x48 { fan0: fan@0x48 {
... ...
cooling-min-state = <0>; cooling-min-level = <0>;
cooling-max-state = <9>; cooling-max-level = <9>;
#cooling-cells = <2>; /* min followed by max */ #cooling-cells = <2>; /* min followed by max */
}; };
}; };