On Fri, Feb 26, 2016 at 11:43:43AM +0800, Leo Yan wrote:
> The property "hysteresis" is mandatory for trip points, so if without
> it the thermal zone cannot register successfully. But "hysteresis" is
> ignored in the thermal subsystem and only inquired by several thermal
> sensor drivers.
>
> So change "hysteresis" as optional properties.
I had forgotten that hysteresis is enforced in DT. Thanks for fixing
this!
> Signed-off-by: Leo Yan <leo.yan@xxxxxxxxxx>
> ---
> Documentation/devicetree/bindings/thermal/thermal.txt | 9 +++++----
> drivers/thermal/of-thermal.c | 9 ++++-----
> 2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
> index 41b817f..7d79e77 100644
> --- a/Documentation/devicetree/bindings/thermal/thermal.txt
> +++ b/Documentation/devicetree/bindings/thermal/thermal.txt
> @@ -89,10 +89,6 @@ Required properties:
> Type: signed in millicelsius.
> Size: one cell
>
> -- hysteresis: A low hysteresis value on temperature property (above).
> - Type: unsigned This is a relative value, in millicelsius.
> - Size: one cell
> -
> - type: a string containing the trip type. Expected values are:
> "active": A trip point to enable active cooling
> "passive": A trip point to enable passive cooling
> @@ -100,6 +96,11 @@ Required properties:
> "critical": Hardware not reliable.
> Type: string
>
> +Optional properties:
> +- hysteresis: A low hysteresis value on temperature property (above).
> + Type: unsigned This is a relative value, in millicelsius.
> + Size: one cell
> +
> * Cooling device maps
>
> The cooling device maps node is a node to describe how cooling devices
> diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
> index 9043f8f..ab05500 100644
> --- a/drivers/thermal/of-thermal.c
> +++ b/drivers/thermal/of-thermal.c
> @@ -689,11 +689,10 @@ static int thermal_of_populate_trip(struct device_node *np,
> trip->temperature = prop;
>
> ret = of_property_read_u32(np, "hysteresis", &prop);
> - if (ret < 0) {
> - pr_err("missing hysteresis property\n");
> - return ret;
> - }
> - trip->hysteresis = prop;
> + if (ret < 0)
> + pr_warning("missing hysteresis property\n");
I'd remove the warning. It is an optional parameter, so there is no
need to warn about something going wrong. As you say in the commit
log, it is ignored in the thermal subsystem and only used by some
sensors so no need to warn about it missing.
Other than that, I'm happy to see this merged.
Acked-by: Javi Merino <javi.merino@xxxxxxx>
> + else
> + trip->hysteresis = prop;
>
> ret = thermal_of_get_trip_type(np, &trip->type);
> if (ret < 0) {
> --
> 1.9.1
>
--
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
