diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-05 09:05:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-05 09:05:16 -0400 |
| commit | 34056394ce75cfe02effca5e2127e5caab6df043 (patch) | |
| tree | 21d0c5f403042cad35f804203979a3adf517f013 /drivers | |
| parent | e7b7dca28f57e9331388550597c0687d3bfaded0 (diff) | |
| parent | a79fca7b44d0dee96e14d31de5869b35b587283c (diff) | |
| download | u-boot-34056394ce75cfe02effca5e2127e5caab6df043.tar.gz u-boot-34056394ce75cfe02effca5e2127e5caab6df043.tar.bz2 u-boot-34056394ce75cfe02effca5e2127e5caab6df043.zip | |
Merge tag 'u-boot-imx-20230905' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for release
-----------------
- imx9: fix DRAM calculation
- thermal: fixes
- fixed for DM, DH and Gateworks boards
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/17639
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thermal/imx_tmu.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c index 97efc55044..4721cfbc02 100644 --- a/drivers/thermal/imx_tmu.c +++ b/drivers/thermal/imx_tmu.c @@ -37,6 +37,7 @@ DECLARE_GLOBAL_DATA_PTR; #define TER_ADC_PD 0x40000000 #define TER_ALPF 0x3 +#define IMX_TMU_POLLING_DELAY_MS 5000 /* * i.MX TMU Registers */ @@ -237,8 +238,8 @@ int imx_tmu_get_temp(struct udevice *dev, int *temp) return ret; while (cpu_tmp >= pdata->alert) { - dev_info(dev, "CPU Temperature (%dC) has beyond alert (%dC), close to critical (%dC) waiting...\n", - cpu_tmp, pdata->alert, pdata->critical); + dev_crit(dev, "CPU Temperature (%dC) is beyond alert (%dC), close to critical (%dC) waiting...\n", + cpu_tmp / 1000, pdata->alert / 1000, pdata->critical / 1000); mdelay(pdata->polling_delay); ret = read_temperature(dev, &cpu_tmp); if (ret) @@ -574,6 +575,8 @@ static int imx_tmu_parse_fdt(struct udevice *dev) dev_dbg(dev, "%s\n", __func__); + pdata->polling_delay = IMX_TMU_POLLING_DELAY_MS; + if (pdata->zone_node) { pdata->regs = (union tmu_regs *)dev_read_addr_ptr(dev); @@ -602,7 +605,8 @@ static int imx_tmu_parse_fdt(struct udevice *dev) dev_dbg(dev, "args.args_count %d, id %d\n", args.args_count, pdata->id); - pdata->polling_delay = dev_read_u32_default(dev, "polling-delay", 1000); + pdata->polling_delay = dev_read_u32_default(dev, "polling-delay", + IMX_TMU_POLLING_DELAY_MS); trips_np = ofnode_path("/thermal-zones/cpu-thermal/trips"); ofnode_for_each_subnode(trips_np, trips_np) { |