Hi Rob, Rob Herring <robherring2@xxxxxxxxx> writes: > On Tue, Sep 8, 2015 at 6:20 AM, Punit Agrawal <punit.agrawal@xxxxxxx> 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@xxxxxxx> >> Cc: Eduardo Valentin <edubezval@xxxxxxxxx> >> Cc: Rob Herring <robh+dt@xxxxxxxxxx> >> Cc: Mark Rutland <mark.rutland@xxxxxxx> >> Cc: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx> >> Cc: Kumar Gala <galak@xxxxxxxxxxxxxx> > > 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@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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