[U-Boot] [PATCH][v2] thermal: imx: add imx7d soc thermal support

[Stefano Babic <sbabic@denx.de>]

Hi Adrian,

On 29/08/2015 01:19, Adrian Alonso wrote:
> Add imx7 SoC thermal driver support
> 
> Signed-off-by: Adrian Alonso <aalonso@freescale.com>
> ---
> Changes for V2: Fix build error for missin macro check ;P
> 
>  drivers/thermal/imx_thermal.c | 86 ++++++++++++++++++++++++++++++++++++++++---
>  1 file changed, 81 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
> index 7848dc3..f3b0ac3 100644
> --- a/drivers/thermal/imx_thermal.c
> +++ b/drivers/thermal/imx_thermal.c
> @@ -25,6 +25,9 @@
>  #define FACTOR1			15976
>  #define FACTOR2			4297157
>  #define MEASURE_FREQ		327
> +#define TEMPERATURE_MIN		-40
> +#define TEMPERATURE_HOT		85
> +#define TEMPERATURE_MAX		125
>  
>  #define TEMPSENSE0_TEMP_CNT_SHIFT	8
>  #define TEMPSENSE0_TEMP_CNT_MASK	(0xfff << TEMPSENSE0_TEMP_CNT_SHIFT)
> @@ -41,7 +44,8 @@ struct thermal_data {
>  	int maxc;
>  };
>  
> -static int read_cpu_temperature_mx6(struct udevice *dev)
> +#if defined(CONFIG_MX6)
> +static int read_cpu_temperature(struct udevice *dev)
>  {
>  	int temperature;
>  	unsigned int reg, n_meas;
> @@ -123,22 +127,87 @@ static int read_cpu_temperature_mx6(struct udevice *dev)
>  
>  	return temperature;
>  }
> +#elif defined(CONFIG_MX7)

Patch is ok for me. I want only to ask if it works dropping the #ifdef,
doing as:

static int read_cpu_temperature(struct udevice *dev)
{
           ......

	if (is_soc_type(MXC_SOC_MX7)) {
		<mx7 specific read_temperature>
	} else {
		<read_cpu_temperature_mx6>		
	}

(I have not checked myself if there are some conflicts with the defines..)

> +static int read_cpu_temperature(struct udevice *dev)
> +{
> +	unsigned int reg, tmp, start;
> +	unsigned int raw_25c, te1;
> +	int temperature;
> +	unsigned int *priv = dev_get_priv(dev);
> +	u32 fuse = *priv;
> +	struct mxc_ccm_anatop_reg *ccm_anatop = (struct mxc_ccm_anatop_reg *)
> +						 ANATOP_BASE_ADDR;
> +	/*
> +	 * fuse data layout:
> +	 * [31:21] sensor value @ 25C
> +	 * [20:18] hot temperature value
> +	 * [17:9] sensor value of room
> +	 * [8:0] sensor value of hot
> +	 */
> +
> +	raw_25c = fuse >> 21;
> +	if (raw_25c == 0)
> +		raw_25c = 25;
> +
> +	te1 = (fuse >> 9) & 0x1ff;
> +
> +	/*
> +	 * now we only use single measure, every time we read
> +	 * the temperature, we will power on/down anadig thermal
> +	 * module
> +	 */
> +	writel(TEMPMON_HW_ANADIG_TEMPSENSE1_POWER_DOWN_MASK, &ccm_anatop->tempsense1_clr);
> +	writel(PMU_REF_REFTOP_SELFBIASOFF_MASK, &ccm_anatop->ref_set);
> +
> +	/* write measure freq */
> +	reg = readl(&ccm_anatop->tempsense1);
> +	reg &= ~TEMPMON_HW_ANADIG_TEMPSENSE1_MEASURE_FREQ_MASK;
> +	reg |= TEMPMON_HW_ANADIG_TEMPSENSE1_MEASURE_FREQ(MEASURE_FREQ);
> +	writel(reg, &ccm_anatop->tempsense1);
> +
> +	writel(TEMPMON_HW_ANADIG_TEMPSENSE1_MEASURE_TEMP_MASK, &ccm_anatop->tempsense1_clr);
> +	writel(TEMPMON_HW_ANADIG_TEMPSENSE1_FINISHED_MASK, &ccm_anatop->tempsense1_clr);
> +	writel(TEMPMON_HW_ANADIG_TEMPSENSE1_MEASURE_TEMP_MASK, &ccm_anatop->tempsense1_set);
> +
> +	start = get_timer(0);
> +	/* Wait max 100ms */
> +	do {
> +		/*
> +		 * Since we can not rely on finish bit, use 1ms delay to get
> +		 * temperature. From RM, 17us is enough to get data, but
> +		 * to gurantee to get the data, delay 100ms here.
> +		 */
> +		reg = readl(&ccm_anatop->tempsense1);
> +		tmp = (reg & TEMPMON_HW_ANADIG_TEMPSENSE1_TEMP_VALUE_MASK)
> +		       >> TEMPMON_HW_ANADIG_TEMPSENSE1_TEMP_VALUE_SHIFT;
> +	} while (get_timer(0) < (start + 100));
> +
> +	writel(TEMPMON_HW_ANADIG_TEMPSENSE1_FINISHED_MASK, &ccm_anatop->tempsense1_clr);
> +
> +	/* power down anatop thermal sensor */
> +	writel(TEMPMON_HW_ANADIG_TEMPSENSE1_POWER_DOWN_MASK, &ccm_anatop->tempsense1_set);
> +	writel(PMU_REF_REFTOP_SELFBIASOFF_MASK, &ccm_anatop->ref_clr);
> +
> +	/* Single point */
> +	temperature = tmp - (te1 - raw_25c);
> +
> +	return temperature;
> +}
> +#endif
>  
>  int imx_thermal_get_temp(struct udevice *dev, int *temp)
>  {
>  	struct thermal_data *priv = dev_get_priv(dev);
>  	int cpu_tmp = 0;
>  
> -	if (is_soc_type(MXC_SOC_MX6))
> -		cpu_tmp = read_cpu_temperature_mx6(dev);
> +	cpu_tmp = read_cpu_temperature(dev);
>  
>  	while (cpu_tmp >= priv->critical) {
>  		printf("CPU Temperature (%dC) too close to max (%dC)",
>  		       cpu_tmp, priv->maxc);
>  		puts(" waiting...\n");
>  		udelay(5000000);
> -		if (is_soc_type(MXC_SOC_MX6))
> -			cpu_tmp = read_cpu_temperature_mx6(dev);
> +		cpu_tmp = read_cpu_temperature(dev);
>  	}
>  
>  	*temp = cpu_tmp;
> @@ -167,6 +236,13 @@ static int imx_thermal_probe(struct udevice *dev)
>  				fuse);
>  			return -EPERM;
>  		}
> +	} else if (is_soc_type(MXC_SOC_MX7)) {
> +		/* No Calibration data in FUSE? */
> +		if ((fuse & 0x3ffff) == 0)
> +			return -EPERM;
> +		/* We do not support 105C TE2 */
> +		if (((fuse & 0x1c0000) >> 18) == 0x6)
> +			return -EPERM;
>  	}
>  
>  	/* set critical cooling temp */
> 

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================