Commit 92e66676 authored by Sudeep Holla's avatar Sudeep Holla Committed by Greg Kroah-Hartman

clk: scpi: don't add cpufreq device if the scpi dvfs node is disabled

commit 67bcc2c5 upstream.

Currently we add the virtual cpufreq device unconditionally even when
the SCPI DVFS clock provider node is disabled. This will cause cpufreq
driver to throw errors when it gets initailised on boot/modprobe and
also when the CPUs are hot-plugged back in.

This patch fixes the issue by adding the virtual cpufreq device only if
the SCPI DVFS clock provider is available and registered.

Fixes: 9490f01e ("clk: scpi: add support for cpufreq virtual device")
Reported-by: default avatarMichał Zegan <webczat_200@poczta.onet.pl>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Tested-by: default avatarMichał Zegan <webczat_200@poczta.onet.pl>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a6f400a
...@@ -290,13 +290,15 @@ static int scpi_clocks_probe(struct platform_device *pdev) ...@@ -290,13 +290,15 @@ static int scpi_clocks_probe(struct platform_device *pdev)
of_node_put(child); of_node_put(child);
return ret; return ret;
} }
}
/* Add the virtual cpufreq device */ if (match->data != &scpi_dvfs_ops)
continue;
/* Add the virtual cpufreq device if it's DVFS clock provider */
cpufreq_dev = platform_device_register_simple("scpi-cpufreq", cpufreq_dev = platform_device_register_simple("scpi-cpufreq",
-1, NULL, 0); -1, NULL, 0);
if (IS_ERR(cpufreq_dev)) if (IS_ERR(cpufreq_dev))
pr_warn("unable to register cpufreq device"); pr_warn("unable to register cpufreq device");
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment