Commit 83beed7b authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal

Pull thermal fixes from Eduardo Valentin:
 "A couple of fixes for the thermal subsystem"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  dt-bindings: thermal: Remove "cooling-{min|max}-level" properties
  dt-bindings: thermal: remove no longer needed samsung thermal properties
parents 7e3cb169 e04907db
...@@ -49,19 +49,6 @@ on the SoC (only first trip points defined in DT will be configured): ...@@ -49,19 +49,6 @@ on the SoC (only first trip points defined in DT will be configured):
- samsung,exynos5433-tmu: 8 - samsung,exynos5433-tmu: 8
- samsung,exynos7-tmu: 8 - samsung,exynos7-tmu: 8
Following properties are mandatory (depending on SoC):
- samsung,tmu_gain: Gain value for internal TMU operation.
- samsung,tmu_reference_voltage: Value of TMU IP block's reference voltage
- samsung,tmu_noise_cancel_mode: Mode for noise cancellation
- samsung,tmu_efuse_value: Default level of temperature - it is needed when
in factory fusing produced wrong value
- samsung,tmu_min_efuse_value: Minimum temperature fused value
- samsung,tmu_max_efuse_value: Maximum temperature fused value
- samsung,tmu_first_point_trim: First point trimming value
- samsung,tmu_second_point_trim: Second point trimming value
- samsung,tmu_default_temp_offset: Default temperature offset
- samsung,tmu_cal_type: Callibration type
** Optional properties: ** Optional properties:
- vtmu-supply: This entry is optional and provides the regulator node supplying - vtmu-supply: This entry is optional and provides the regulator node supplying
...@@ -78,7 +65,7 @@ Example 1): ...@@ -78,7 +65,7 @@ Example 1):
clocks = <&clock 383>; clocks = <&clock 383>;
clock-names = "tmu_apbif"; clock-names = "tmu_apbif";
vtmu-supply = <&tmu_regulator_node>; vtmu-supply = <&tmu_regulator_node>;
#include "exynos4412-tmu-sensor-conf.dtsi" #thermal-sensor-cells = <0>;
}; };
Example 2): Example 2):
...@@ -89,7 +76,7 @@ Example 2): ...@@ -89,7 +76,7 @@ Example 2):
interrupts = <0 58 0>; interrupts = <0 58 0>;
clocks = <&clock 21>; clocks = <&clock 21>;
clock-names = "tmu_apbif"; clock-names = "tmu_apbif";
#include "exynos5440-tmu-sensor-conf.dtsi" #thermal-sensor-cells = <0>;
}; };
Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
...@@ -99,7 +86,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") ...@@ -99,7 +86,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
interrupts = <0 184 0>; interrupts = <0 184 0>;
clocks = <&clock 318>, <&clock 318>; clocks = <&clock 318>, <&clock 318>;
clock-names = "tmu_apbif", "tmu_triminfo_apbif"; clock-names = "tmu_apbif", "tmu_triminfo_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi" #thermal-sensor-cells = <0>;
}; };
tmu_cpu3: tmu@1006c000 { tmu_cpu3: tmu@1006c000 {
...@@ -108,7 +95,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") ...@@ -108,7 +95,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
interrupts = <0 185 0>; interrupts = <0 185 0>;
clocks = <&clock 318>, <&clock 319>; clocks = <&clock 318>, <&clock 319>;
clock-names = "tmu_apbif", "tmu_triminfo_apbif"; clock-names = "tmu_apbif", "tmu_triminfo_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi" #thermal-sensor-cells = <0>;
}; };
tmu_gpu: tmu@100a0000 { tmu_gpu: tmu@100a0000 {
...@@ -117,7 +104,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") ...@@ -117,7 +104,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
interrupts = <0 215 0>; interrupts = <0 215 0>;
clocks = <&clock 319>, <&clock 318>; clocks = <&clock 319>, <&clock 318>;
clock-names = "tmu_apbif", "tmu_triminfo_apbif"; clock-names = "tmu_apbif", "tmu_triminfo_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi" #thermal-sensor-cells = <0>;
}; };
Note: For multi-instance tmu each instance should have an alias correctly Note: For multi-instance tmu each instance should have an alias correctly
......
...@@ -55,8 +55,7 @@ of heat dissipation). For example a fan's cooling states correspond to ...@@ -55,8 +55,7 @@ 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 by the cooling-min-level and cooling-max-level 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:
...@@ -69,15 +68,6 @@ Required properties: ...@@ -69,15 +68,6 @@ Required properties:
See Cooling device maps section below for more details See Cooling device maps section below for more details
on how consumers refer to cooling devices. on how consumers refer to cooling devices.
Optional properties:
- cooling-min-level: An integer indicating the smallest
Type: unsigned cooling state accepted. Typically 0.
Size: one cell
- cooling-max-level: An integer indicating the largest
Type: unsigned cooling state accepted.
Size: one cell
* Trip points * Trip points
The trip node is a node to describe a point in the temperature domain The trip node is a node to describe a point in the temperature domain
...@@ -226,8 +216,6 @@ cpus { ...@@ -226,8 +216,6 @@ cpus {
396000 950000 396000 950000
198000 850000 198000 850000
>; >;
cooling-min-level = <0>;
cooling-max-level = <3>;
#cooling-cells = <2>; /* min followed by max */ #cooling-cells = <2>; /* min followed by max */
}; };
... ...
...@@ -241,8 +229,6 @@ cpus { ...@@ -241,8 +229,6 @@ cpus {
*/ */
fan0: fan@48 { fan0: fan@48 {
... ...
cooling-min-level = <0>;
cooling-max-level = <9>;
#cooling-cells = <2>; /* min followed by max */ #cooling-cells = <2>; /* min followed by max */
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment