Allow hwmon devices to be optionally created for of-thermal zones,
rather than permanently denying them "in case" there is a hwmon
driver duplicating the thermal driver.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxx>
---
Without this, "sensors" is unable to report the temperature of the
Dove SoC when it supports thermal zones.
Documentation/devicetree/bindings/thermal/thermal.txt | 3 +++
arch/arm/boot/dts/dove.dtsi | 1 +
drivers/thermal/of-thermal.c | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
index 88b6ea1ad290..1478735fff85 100644
--- a/Documentation/devicetree/bindings/thermal/thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/thermal.txt
@@ -175,6 +175,9 @@ containing trip nodes and one sub-node containing all the zone cooling maps.
2000mW, while on a 10'' tablet is around
4500mW.
+- linux,hwmon: Allow Linux to create hwmon devices for the thermal
+ Type: bool zone.
+
Note: The delay properties are bound to the maximum dT/dt (temperature
derivative over time) in two situations for a thermal zone:
(i) - when passive cooling is activated (polling-delay-passive); and
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 40fb98687230..00f5971cd039 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -804,6 +804,7 @@
thermal-zones {
soc-thermal {
+ linux,hwmon;
polling-delay-passive = <250>; /* ms */
polling-delay = <1000>; /* ms */
thermal-sensors = <&thermal>;
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index d04ec3b9e5ff..5cd1838405f0 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -995,7 +995,8 @@ int __init of_parse_thermal_zones(void)
}
/* No hwmon because there might be hwmon drivers registering */
- tzp->no_hwmon = true;
+ if (!of_property_read_bool(child, "linux,hwmon"))
+ tzp->no_hwmon = true;
if (!of_property_read_u32(child, "sustainable-power", &prop))
tzp->sustainable_power = prop;
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
