@@ -630,17 +630,29 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match);
static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)
{
struct device_node *np;
+ struct device *cpu_dev;
int ret = 0;
- data->policy = cpufreq_cpu_get(0);
- if (!data->policy) {
- pr_debug("%s: CPUFreq policy not found\n", __func__);
- return -EPROBE_DEFER;
+ cpu_dev = get_cpu_device(0);
+ if (!cpu_dev) {
+ pr_err("imx thermal: failed to get cpu0 device\n");
+ return -ENODEV;
+ }
+
+ np = of_node_get(cpu_dev->of_node);
+ if (!np) {
+ pr_err("imx thermal: failed to find cpu0 node\n");
+ return -ENOENT;
}
- np = of_get_cpu_node(data->policy->cpu, NULL);
+ if (!of_find_property(np, "#cooling-cells", NULL)) {
+ data->policy = cpufreq_cpu_get(0);
+ if (!data->policy) {
+ pr_debug("%s: CPUFreq policy not found\n", __func__);
+ ret = -EPROBE_DEFER;
+ goto put_node;
+ }
- if (!np || !of_find_property(np, "#cooling-cells", NULL)) {
data->cdev = cpufreq_cooling_register(data->policy);
if (IS_ERR(data->cdev)) {
ret = PTR_ERR(data->cdev);
@@ -648,6 +660,7 @@ static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)
}
}
+put_node:
of_node_put(np);
return ret;
The legacy CPU cooling should ONLY be used when "#cooling-cells" is NOT present in cpu node, current implementation for registering legacy cooling always return -EPROBE_DEFER when cpufreq is NOT ready, that will cause thermal driver probe failed when cpufreq failed to probe with a non -EPROBE_DEFER reason. In such case, thermal driver should continue probe and provide temperature monitor and other cooling methods. So, for the case of "#cooling-cells" present in cpu node, no need to return -EPROBE_DEFER even cpufreq is NOT ready, this is to make sure thermal driver can continue probe. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> --- drivers/thermal/imx_thermal.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)