[PATCH 0/2] Update OF thermal properties for cooling-{min,max}-level

[PATCH 0/2] Update OF thermal properties for cooling-{min,max}-level

[Punit Agrawal]

Hi,

The device tree properties regarding the specification and usage of
states for cooling devices suffer from inconsistency in the bindings
as well as the usage.

The two patches here update the bindings to be consistent without
breaking existing support for the device trees already in upstream.

Thanks,
Punit

Punit Agrawal (2):
  of: thermal: Fix inconsitency between cooling-*-state and
    cooling-*-level
  of: thermal: Mark cooling-*-level properties optional

 .../devicetree/bindings/thermal/thermal.txt        | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

-- 
2.5.0

[PATCH 1/2] of: thermal: Fix inconsitency between cooling-*-state and cooling-*-level

[Punit Agrawal]

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>
---
 Documentation/devicetree/bindings/thermal/thermal.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
index 8a49362..8320186 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
 the different fan speeds possible. Cooling states are referred to by
 single unsigned integers, where larger numbers mean greater heat
 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.
 For more examples of cooling devices, refer to the example sections below.
 
 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.
   Size: one cell
 
-- cooling-max-state:	An integer indicating the largest
+- cooling-max-level:	An integer indicating the largest
   Type: unsigned	cooling state accepted.
   Size: one cell
 
@@ -225,8 +225,8 @@ cpus {
 			396000  950000
 			198000  850000
 		>;
-		cooling-min-state = <0>;
-		cooling-max-state = <3>;
+		cooling-min-level = <0>;
+		cooling-max-level = <3>;
 		#cooling-cells = <2>; /* min followed by max */
 	};
 	...
@@ -240,8 +240,8 @@ cpus {
 	 */
 	fan0: fan@0x48 {
 		...
-		cooling-min-state = <0>;
-		cooling-max-state = <9>;
+		cooling-min-level = <0>;
+		cooling-max-level = <9>;
 		#cooling-cells = <2>; /* min followed by max */
 	};
 };
-- 
2.5.0

Re: [PATCH 1/2] of: thermal: Fix inconsitency between cooling-*-state and cooling-*-level

[Rob Herring]

On Tue, Sep 8, 2015 at 6:20 AM, Punit Agrawal <punit.agrawal@arm.com> wrote:
> 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>

Both patches applied. Thanks.

Rob

> ---
>  Documentation/devicetree/bindings/thermal/thermal.txt | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
> index 8a49362..8320186 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
>  the different fan speeds possible. Cooling states are referred to by
>  single unsigned integers, where larger numbers mean greater heat
>  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.
>  For more examples of cooling devices, refer to the example sections below.
>
>  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.
>    Size: one cell
>
> -- cooling-max-state:   An integer indicating the largest
> +- cooling-max-level:   An integer indicating the largest
>    Type: unsigned       cooling state accepted.
>    Size: one cell
>
> @@ -225,8 +225,8 @@ cpus {
>                         396000  950000
>                         198000  850000
>                 >;
> -               cooling-min-state = <0>;
> -               cooling-max-state = <3>;
> +               cooling-min-level = <0>;
> +               cooling-max-level = <3>;
>                 #cooling-cells = <2>; /* min followed by max */
>         };
>         ...
> @@ -240,8 +240,8 @@ cpus {
>          */
>         fan0: fan@0x48 {
>                 ...
> -               cooling-min-state = <0>;
> -               cooling-max-state = <9>;
> +               cooling-min-level = <0>;
> +               cooling-max-level = <9>;
>                 #cooling-cells = <2>; /* min followed by max */
>         };
>  };
> --
> 2.5.0
>

Re: [PATCH 1/2] of: thermal: Fix inconsitency between cooling-*-state and cooling-*-level

[Punit Agrawal]

Hi Rob,

Rob Herring <robherring2@gmail.com> writes:

> On Tue, Sep 8, 2015 at 6:20 AM, Punit Agrawal <punit.agrawal@arm.com> wrote:
>> 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>
>
> Both patches applied. Thanks.

I see the patches in v4.3-rc3 now. Thanks for picking up these fixes.

Cheers,
Punit

>
> Rob
>
>> ---
>>  Documentation/devicetree/bindings/thermal/thermal.txt | 14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
>> index 8a49362..8320186 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
>>  the different fan speeds possible. Cooling states are referred to by
>>  single unsigned integers, where larger numbers mean greater heat
>>  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.
>>  For more examples of cooling devices, refer to the example sections below.
>>
>>  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.
>>    Size: one cell
>>
>> -- cooling-max-state:   An integer indicating the largest
>> +- cooling-max-level:   An integer indicating the largest
>>    Type: unsigned       cooling state accepted.
>>    Size: one cell
>>
>> @@ -225,8 +225,8 @@ cpus {
>>                         396000  950000
>>                         198000  850000
>>                 >;
>> -               cooling-min-state = <0>;
>> -               cooling-max-state = <3>;
>> +               cooling-min-level = <0>;
>> +               cooling-max-level = <3>;
>>                 #cooling-cells = <2>; /* min followed by max */
>>         };
>>         ...
>> @@ -240,8 +240,8 @@ cpus {
>>          */
>>         fan0: fan@0x48 {
>>                 ...
>> -               cooling-min-state = <0>;
>> -               cooling-max-state = <9>;
>> +               cooling-min-level = <0>;
>> +               cooling-max-level = <9>;
>>                 #cooling-cells = <2>; /* min followed by max */
>>         };
>>  };
>> --
>> 2.5.0
>>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] of: thermal: Mark cooling-*-level properties optional

[Punit Agrawal]

The cooling-{min,max}-level properties are marked as optional in
Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt and the usage
in various device tree matches this, i.e., some cooling device in the
device trees provide these properties while others do not.

Make the bindings in
Documentation/devicetree/bindings/thermal/thermal.txt consistent with
the cpufreq-dt bindings by marking the cooling-*-level properties as
optional.

Signed-off-by: Punit Agrawal <punit.agrawal-5wv7dgnIgG8@public.gmane.org>
Cc: Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
Cc: Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
Cc: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
---
 Documentation/devicetree/bindings/thermal/thermal.txt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
index 8320186..41b817f 100644
--- a/Documentation/devicetree/bindings/thermal/thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/thermal.txt
@@ -60,14 +60,6 @@ properties) should be defined in a particular device's binding.
 For more examples of cooling devices, refer to the example sections below.
 
 Required 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
-
 - #cooling-cells:	Used to provide cooling device specific information
   Type: unsigned	while referring to it. Must be at least 2, in order
   Size: one cell      	to specify minimum and maximum cooling state used
@@ -77,6 +69,15 @@ Required properties:
 			See Cooling device maps section below for more details
 			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
 
 The trip node is a node to describe a point in the temperature domain
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/2] Update OF thermal properties for cooling-{min,max}-level

[Punit Agrawal]

Punit Agrawal <punit.agrawal@arm.com> writes:

> Hi,
>
> The device tree properties regarding the specification and usage of
> states for cooling devices suffer from inconsistency in the bindings
> as well as the usage.
>
> The two patches here update the bindings to be consistent without
> breaking existing support for the device trees already in upstream.
>

Gentle reminder to request review of the below two patches!

> Thanks,
> Punit
>
> Punit Agrawal (2):
>   of: thermal: Fix inconsitency between cooling-*-state and
>     cooling-*-level
>   of: thermal: Mark cooling-*-level properties optional
>
>  .../devicetree/bindings/thermal/thermal.txt        | 27 +++++++++++-----------
>  1 file changed, 14 insertions(+), 13 deletions(-)

Re: [PATCH 0/2] Update OF thermal properties for cooling-{min,max}-level

[Rob Herring]

On 09/08/2015 06:16 AM, Punit Agrawal wrote:
> Hi,
> 
> The device tree properties regarding the specification and usage of
> states for cooling devices suffer from inconsistency in the bindings
> as well as the usage.
> 
> The two patches here update the bindings to be consistent without
> breaking existing support for the device trees already in upstream.
> 
> Thanks,
> Punit
> 
> Punit Agrawal (2):
>   of: thermal: Fix inconsitency between cooling-*-state and
>     cooling-*-level
>   of: thermal: Mark cooling-*-level properties optional

Applied, thanks.

Rob

> 
>  .../devicetree/bindings/thermal/thermal.txt        | 27 +++++++++++-----------
>  1 file changed, 14 insertions(+), 13 deletions(-)
>