Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

thermal: imx_thermal: rework driver to be reused

Browse Source 
Rework imx_thermal driver to be used across i.MX
processor that support thermal sensor

Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
master
Adrian Alonso 9 years ago committed by Stefano Babic
parent 15c52b3ddd
commit 1368f99346
13 changed files with 27 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/arm/cpu/armv7/mx6/soc.c
  2. 10
      arch/arm/imx-common/cpu.c
  3. 2
      drivers/thermal/Makefile
  4. 18
      drivers/thermal/imx_thermal.c
  5. 4
      include/configs/cgtqmx6eval.h
  6. 2
      include/configs/embestmx6boards.h
  7. 2
      include/configs/gw_ventana.h
  8. 2
      include/configs/mx6cuboxi.h
  9. 2
      include/configs/mx6sabre_common.h
  10. 2
      include/configs/mx6slevk.h
  11. 2
      include/configs/mx6sxsabresd.h
  12. 2
      include/configs/mx6ul_14x14_evk.h
  13. 2
      include/configs/tbs2910.h

2
arch/arm/cpu/armv7/mx6/soc.c
Unescape View File

@ -38,7 +38,7 @@ struct scu_regs {
u32 fpga_rev;
};
#if defined(CONFIG_IMX6_THERMAL)
#if defined(CONFIG_IMX_THERMAL)
static const struct imx_thermal_plat imx6_thermal_plat = {
.regs = (void *)ANATOP_BASE_ADDR,
.fuse_bank = 1,

10
arch/arm/imx-common/cpu.c
Unescape View File

@ -154,14 +154,12 @@ int print_cpuinfo(void)
u32 cpurev;
__maybe_unused u32 max_freq;
#if defined(CONFIG_MX6) && defined(CONFIG_IMX6_THERMAL)
cpurev = get_cpu_rev();
#if defined(CONFIG_IMX_THERMAL)
struct udevice *thermal_dev;
int cpu_tmp, minc, maxc, ret;
#endif
cpurev = get_cpu_rev();
#if defined(CONFIG_MX6)
printf("CPU: Freescale i.MX%s rev%d.%d",
get_imx_type((cpurev & 0xFF000) >> 12),
(cpurev & 0x000F0) >> 4,
@ -181,7 +179,7 @@ int print_cpuinfo(void)
mxc_get_clock(MXC_ARM_CLK) / 1000000);
#endif
#if defined(CONFIG_MX6) && defined(CONFIG_IMX6_THERMAL)
#if defined(CONFIG_IMX_THERMAL)
puts("CPU: ");
switch (get_cpu_temp_grade(&minc, &maxc)) {
case TEMP_AUTOMOTIVE:

2
drivers/thermal/Makefile
Unescape View File

@ -6,4 +6,4 @@
#
obj-$(CONFIG_DM_THERMAL) += thermal-uclass.o
obj-$(CONFIG_IMX6_THERMAL) += imx_thermal.o
obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o

18
drivers/thermal/imx_thermal.c
Unescape View File

@ -41,7 +41,7 @@ struct thermal_data {
int maxc;
};
static int read_cpu_temperature(struct udevice *dev)
static int read_cpu_temperature_mx6(struct udevice *dev)
{
int temperature;
unsigned int reg, n_meas;
@ -129,13 +129,15 @@ int imx_thermal_get_temp(struct udevice *dev, int *temp)
struct thermal_data *priv = dev_get_priv(dev);
int cpu_tmp = 0;
cpu_tmp = read_cpu_temperature(dev);
if (is_soc_type(MXC_SOC_MX6))
cpu_tmp = read_cpu_temperature_mx6(dev);
while (cpu_tmp >= priv->critical) {
printf("CPU Temperature (%dC) too close to max (%dC)",
cpu_tmp, priv->maxc);
puts(" waiting...\n");
udelay(5000000);
cpu_tmp = read_cpu_temperature(dev);
if (is_soc_type(MXC_SOC_MX6))
cpu_tmp = read_cpu_temperature_mx6(dev);
}
*temp = cpu_tmp;
@ -157,10 +159,12 @@ static int imx_thermal_probe(struct udevice *dev)
/* Read Temperature calibration data fuse */
fuse_read(pdata->fuse_bank, pdata->fuse_word, &fuse);
/* Check for valid fuse */
if (fuse == 0 || fuse == ~0) {
printf("CPU: Thermal invalid data, fuse: 0x%x\n", fuse);
return -EPERM;
if (is_soc_type(MXC_SOC_MX6)) {
/* Check for valid fuse */
if (fuse == 0 || fuse == ~0) {
printf("CPU: Thermal invalid data, fuse: 0x%x\n", fuse);
return -EPERM;
}
}
/* set critical cooling temp */

4
include/configs/cgtqmx6eval.h
Unescape View File

@ -33,10 +33,10 @@
#define CONFIG_CMD_BMODE
/* Thermal support */
#define CONFIG_IMX6_THERMAL
#define CONFIG_IMX_THERMAL
#define CONFIG_CMD_FUSE
#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL)
#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX_THERMAL)
#define CONFIG_MXC_OCOTP
#endif

2
include/configs/embestmx6boards.h
Unescape View File

@ -19,7 +19,7 @@
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
#define CONFIG_IMX6_THERMAL
#define CONFIG_IMX_THERMAL
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)

2
include/configs/gw_ventana.h
Unescape View File

@ -57,7 +57,7 @@
#define CONFIG_CMD_GPIO
/* Thermal */
#define CONFIG_IMX6_THERMAL
#define CONFIG_IMX_THERMAL
/* Serial */
#define CONFIG_MXC_UART

2
include/configs/mx6cuboxi.h
Unescape View File

@ -14,7 +14,7 @@
#define CONFIG_SPL_MMC_SUPPORT
#include "imx6_spl.h"
#define CONFIG_IMX6_THERMAL
#define CONFIG_IMX_THERMAL
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
#define CONFIG_BOARD_EARLY_INIT_F

2
include/configs/mx6sabre_common.h
Unescape View File

@ -11,7 +11,7 @@
#include "mx6_common.h"
#define CONFIG_IMX6_THERMAL
#define CONFIG_IMX_THERMAL
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)

2
include/configs/mx6slevk.h
Unescape View File

@ -197,6 +197,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC2*/
#endif
#define CONFIG_IMX6_THERMAL
#define CONFIG_IMX_THERMAL
#endif /* __CONFIG_H */

2
include/configs/mx6sxsabresd.h
Unescape View File

@ -177,7 +177,7 @@
#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1)
#endif
#define CONFIG_IMX6_THERMAL
#define CONFIG_IMX_THERMAL
#define CONFIG_CMD_TIME

2
include/configs/mx6ul_14x14_evk.h
Unescape View File

@ -241,6 +241,6 @@
#define CONFIG_FEC_DMA_MINALIGN 64
#endif
#define CONFIG_IMX6_THERMAL
#define CONFIG_IMX_THERMAL
#endif

2
include/configs/tbs2910.h
Unescape View File

@ -20,7 +20,7 @@
#define CONFIG_SYS_HZ 1000
#define CONFIG_IMX6_THERMAL
#define CONFIG_IMX_THERMAL
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1

Write Preview
Loading…
Cancel
Save