diff options
author | Punit Agrawal <punit.agrawal@arm.com> | 2015-09-08 07:20:48 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2015-09-17 15:36:36 -0400 |
commit | eb168b70dea54578a45119fcdb3b48ad5d75fed9 (patch) | |
tree | 42f3ff2d9e4e76d2ffb01420753c575c652270ce /Documentation | |
parent | dc4dae00d82fedcd7a632f786f9f76c1f7f929a5 (diff) |
of: thermal: Fix inconsitency between cooling-*-state and cooling-*-level
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>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/thermal/thermal.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt index 8a49362dea6e..8320186738ff 100644 --- a/Documentation/devicetree/bindings/thermal/thermal.txt +++ b/Documentation/devicetree/bindings/thermal/thermal.txt | |||
@@ -55,16 +55,16 @@ of heat dissipation). For example a fan's cooling states correspond to | |||
55 | the different fan speeds possible. Cooling states are referred to by | 55 | the different fan speeds possible. Cooling states are referred to by |
56 | single unsigned integers, where larger numbers mean greater heat | 56 | single unsigned integers, where larger numbers mean greater heat |
57 | dissipation. The precise set of cooling states associated with a device | 57 | dissipation. The precise set of cooling states associated with a device |
58 | (as referred to be the cooling-min-state and cooling-max-state | 58 | (as referred to by the cooling-min-level and cooling-max-level |
59 | properties) should be defined in a particular device's binding. | 59 | properties) should be defined in a particular device's binding. |
60 | For more examples of cooling devices, refer to the example sections below. | 60 | For more examples of cooling devices, refer to the example sections below. |
61 | 61 | ||
62 | Required properties: | 62 | Required properties: |
63 | - cooling-min-state: An integer indicating the smallest | 63 | - cooling-min-level: An integer indicating the smallest |
64 | Type: unsigned cooling state accepted. Typically 0. | 64 | Type: unsigned cooling state accepted. Typically 0. |
65 | Size: one cell | 65 | Size: one cell |
66 | 66 | ||
67 | - cooling-max-state: An integer indicating the largest | 67 | - cooling-max-level: An integer indicating the largest |
68 | Type: unsigned cooling state accepted. | 68 | Type: unsigned cooling state accepted. |
69 | Size: one cell | 69 | Size: one cell |
70 | 70 | ||
@@ -225,8 +225,8 @@ cpus { | |||
225 | 396000 950000 | 225 | 396000 950000 |
226 | 198000 850000 | 226 | 198000 850000 |
227 | >; | 227 | >; |
228 | cooling-min-state = <0>; | 228 | cooling-min-level = <0>; |
229 | cooling-max-state = <3>; | 229 | cooling-max-level = <3>; |
230 | #cooling-cells = <2>; /* min followed by max */ | 230 | #cooling-cells = <2>; /* min followed by max */ |
231 | }; | 231 | }; |
232 | ... | 232 | ... |
@@ -240,8 +240,8 @@ cpus { | |||
240 | */ | 240 | */ |
241 | fan0: fan@0x48 { | 241 | fan0: fan@0x48 { |
242 | ... | 242 | ... |
243 | cooling-min-state = <0>; | 243 | cooling-min-level = <0>; |
244 | cooling-max-state = <9>; | 244 | cooling-max-level = <9>; |
245 | #cooling-cells = <2>; /* min followed by max */ | 245 | #cooling-cells = <2>; /* min followed by max */ |
246 | }; | 246 | }; |
247 | }; | 247 | }; |