[PATCH for 3.9 0/2] thermal: Marvell SoC thermal formula fixes

[PATCH for 3.9 0/2] thermal: Marvell SoC thermal formula fixes

[Ezequiel Garcia]

This is a small patchset that fixes thermal sensor formulas for Kirkwood
and Dove thermal driver. The old formulas had been taken from 88AP510 public
datasheets which appears to be slightly wrong.

The current formula comes from Marvell internal documentation
and has been confirmed by Lior Amsalem.

This has been tested on a Kirkwood board (Openblocks A6) only.
If at all possible, I would like to have the Dove fix tested
before this is merged.

Please note that this fix was previously part of a bigger thermal
patchset [1]. I've taken this out so it can be applied on v3.9 first.

[1] http://www.spinics.net/lists/arm-kernel/msg231697.html

Ezequiel Garcia (2):
  thermal: kirkwood: Fix thermal sensor formula
  thermal: dove: Fix thermal sensor formula

 drivers/thermal/dove_thermal.c     |    7 ++++---
 drivers/thermal/kirkwood_thermal.c |    8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

-- 
1.7.8.6

[PATCH 1/2] thermal: kirkwood: Fix thermal sensor formula

[Ezequiel Garcia]

The currently formula has been taken from the 88AP510 SoC datasheet,
which is not exactly correct. The correct value for the temperature
in Celcius of the sensor present in this SoC is:

  Celsius = (322-reg)/1.3625

Signed-off-by: Lior Amsalem <alior@marvell.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 drivers/thermal/kirkwood_thermal.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
index 65cb4f0..84b331f 100644
--- a/drivers/thermal/kirkwood_thermal.c
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -49,13 +49,13 @@ static int kirkwood_get_temp(struct thermal_zone_device *thermal,
 	}
 
 	/*
-	 * Calculate temperature. See Section 8.10.1 of the 88AP510,
-	 * datasheet, which has the same sensor.
-	 * Documentation/arm/Marvell/README
+	 * Calculate temperature. According to Marvell internal
+	 * documentation the formula for this is:
+	 * Celsius = (322-reg)/1.3625
 	 */
 	reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) &
 		KIRKWOOD_THERMAL_TEMP_MASK;
-	*temp = ((2281638UL - (7298*reg)) / 10);
+	*temp = ((3220000000UL - (10000000UL * reg)) / 13625);
 
 	return 0;
 }
-- 
1.7.8.6

[PATCH 1/2] thermal: kirkwood: Fix thermal sensor formula

[Zhang Rui]

On Fri, 2013-03-22 at 09:23 -0300, Ezequiel Garcia wrote:
> The currently formula has been taken from the 88AP510 SoC datasheet,
> which is not exactly correct. The correct value for the temperature
> in Celcius of the sensor present in this SoC is:
> 
>   Celsius = (322-reg)/1.3625
> 
> Signed-off-by: Lior Amsalem <alior@marvell.com>
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>

applied to thermal -next.

thanks,
rui
> ---
>  drivers/thermal/kirkwood_thermal.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
> index 65cb4f0..84b331f 100644
> --- a/drivers/thermal/kirkwood_thermal.c
> +++ b/drivers/thermal/kirkwood_thermal.c
> @@ -49,13 +49,13 @@ static int kirkwood_get_temp(struct thermal_zone_device *thermal,
>  	}
>  
>  	/*
> -	 * Calculate temperature. See Section 8.10.1 of the 88AP510,
> -	 * datasheet, which has the same sensor.
> -	 * Documentation/arm/Marvell/README
> +	 * Calculate temperature. According to Marvell internal
> +	 * documentation the formula for this is:
> +	 * Celsius = (322-reg)/1.3625
>  	 */
>  	reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) &
>  		KIRKWOOD_THERMAL_TEMP_MASK;
> -	*temp = ((2281638UL - (7298*reg)) / 10);
> +	*temp = ((3220000000UL - (10000000UL * reg)) / 13625);
>  
>  	return 0;
>  }

[PATCH 2/2] thermal: dove: Fix thermal sensor formula

[Ezequiel Garcia]

The currently formula has been taken from the 88AP510 SoC datasheet,
which is not exactly correct. The correct value for the temperature
in Celcius of the sensor present in this SoC is:

  Celsius = (322-reg)/1.3625

Signed-off-by: Lior Amsalem <alior@marvell.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
Tested by compilation only.

 drivers/thermal/dove_thermal.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
index 7b0bfa0..ddd73a5 100644
--- a/drivers/thermal/dove_thermal.c
+++ b/drivers/thermal/dove_thermal.c
@@ -107,12 +107,13 @@ static int dove_get_temp(struct thermal_zone_device *thermal,
 	}
 
 	/*
-	 * Calculate temperature. See Section 8.10.1 of 88AP510,
-	 * Documentation/arm/Marvell/README
+	 * Calculate temperature. According to Marvell internal
+	 * documentation the formula for this is:
+	 * Celsius = (322-reg)/1.3625
 	 */
 	reg = readl_relaxed(priv->sensor);
 	reg = (reg >> DOVE_THERMAL_TEMP_OFFSET) & DOVE_THERMAL_TEMP_MASK;
-	*temp = ((2281638UL - (7298*reg)) / 10);
+	*temp = ((3220000000UL - (10000000UL * reg)) / 13625);
 
 	return 0;
 }
-- 
1.7.8.6

[PATCH 2/2] thermal: dove: Fix thermal sensor formula

[Zhang Rui]

On Fri, 2013-03-22 at 09:23 -0300, Ezequiel Garcia wrote:
> The currently formula has been taken from the 88AP510 SoC datasheet,
> which is not exactly correct. The correct value for the temperature
> in Celcius of the sensor present in this SoC is:
> 
>   Celsius = (322-reg)/1.3625
> 
> Signed-off-by: Lior Amsalem <alior@marvell.com>
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>

applied to thermal -next.

thanks,
rui
> ---
> Tested by compilation only.
> 
>  drivers/thermal/dove_thermal.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
> index 7b0bfa0..ddd73a5 100644
> --- a/drivers/thermal/dove_thermal.c
> +++ b/drivers/thermal/dove_thermal.c
> @@ -107,12 +107,13 @@ static int dove_get_temp(struct thermal_zone_device *thermal,
>  	}
>  
>  	/*
> -	 * Calculate temperature. See Section 8.10.1 of 88AP510,
> -	 * Documentation/arm/Marvell/README
> +	 * Calculate temperature. According to Marvell internal
> +	 * documentation the formula for this is:
> +	 * Celsius = (322-reg)/1.3625
>  	 */
>  	reg = readl_relaxed(priv->sensor);
>  	reg = (reg >> DOVE_THERMAL_TEMP_OFFSET) & DOVE_THERMAL_TEMP_MASK;
> -	*temp = ((2281638UL - (7298*reg)) / 10);
> +	*temp = ((3220000000UL - (10000000UL * reg)) / 13625);
>  
>  	return 0;
>  }

[PATCH for 3.9 0/2] thermal: Marvell SoC thermal formula fixes

[Zhang Rui]

Hi,

Ezequiel, thanks for your patch.

On Fri, 2013-03-22 at 09:23 -0300, Ezequiel Garcia wrote:
> This is a small patchset that fixes thermal sensor formulas for Kirkwood
> and Dove thermal driver. The old formulas had been taken from 88AP510 public
> datasheets which appears to be slightly wrong.
> 
> The current formula comes from Marvell internal documentation
> and has been confirmed by Lior Amsalem.
> 
> This has been tested on a Kirkwood board (Openblocks A6) only.
> If at all possible, I would like to have the Dove fix tested
> before this is merged.
> 
> Please note that this fix was previously part of a bigger thermal
> patchset [1]. I've taken this out so it can be applied on v3.9 first.
> 
> [1] http://www.spinics.net/lists/arm-kernel/msg231697.html
> 
> Ezequiel Garcia (2):
>   thermal: kirkwood: Fix thermal sensor formula
>   thermal: dove: Fix thermal sensor formula
> 

Nobuhiro and Andrew,

what do you think of these patches?
As I have no idea of the hardware details, I need your comments before
applying them.

thanks,
rui

>  drivers/thermal/dove_thermal.c     |    7 ++++---
>  drivers/thermal/kirkwood_thermal.c |    8 ++++----
>  2 files changed, 8 insertions(+), 7 deletions(-)
> 

[PATCH for 3.9 0/2] thermal: Marvell SoC thermal formula fixes

[Andrew Lunn]

On Mon, Mar 25, 2013 at 04:17:36PM +0800, Zhang Rui wrote:
> Hi,
> 
> Ezequiel, thanks for your patch.
> 
> On Fri, 2013-03-22 at 09:23 -0300, Ezequiel Garcia wrote:
> > This is a small patchset that fixes thermal sensor formulas for Kirkwood
> > and Dove thermal driver. The old formulas had been taken from 88AP510 public
> > datasheets which appears to be slightly wrong.
> > 
> > The current formula comes from Marvell internal documentation
> > and has been confirmed by Lior Amsalem.
> > 
> > This has been tested on a Kirkwood board (Openblocks A6) only.
> > If at all possible, I would like to have the Dove fix tested
> > before this is merged.
> > 
> > Please note that this fix was previously part of a bigger thermal
> > patchset [1]. I've taken this out so it can be applied on v3.9 first.
> > 
> > [1] http://www.spinics.net/lists/arm-kernel/msg231697.html
> > 
> > Ezequiel Garcia (2):
> >   thermal: kirkwood: Fix thermal sensor formula
> >   thermal: dove: Fix thermal sensor formula
> > 
> 
> Nobuhiro and Andrew,
> 
> what do you think of these patches?
> As I have no idea of the hardware details, I need your comments before
> applying them.

I have no access to the internal documentation, so i cannot say if
this formula is correct or not. However, Lior Amsalem should be in the
know.

Acked-by: Andrew Lunn <andrew@lunn.ch>

	  Andrew