iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Power management fix for 5.10-rc6

Browse Source 
Fix a recently introduced build issue in the cpufreq SCMI
 driver (Sudeep Holla).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAl+/23ISHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxqr8P/0uRfqFXLAkFzVz4myQU7geuL7tL51DG
 G9pitNLq8j5kEF3UM74RstL/NZkg7p+VAyBFF8u9W42V2DAxfuyG6aG4rmDJbnBz
 pCvSk6RvIkneAwQ1lCYV47YRvK8rqkTcpFK5ZA2fq8oIm0bDAfkuLhsY/OoKNtJ9
 sJv/EVBpdQKA8g3H9EQzqOpUpGc6u7xG+zQEa6ZYVNpYaeSVYixsy+wRsjIktmxr
 KzmjYYYBByNz/j0jX+SIq8CJLdzDTjwsCjnh9TB1UTmr2Ii0ZCe222VTLp/uRFR/
 TrsUGuIl/XKdSRHZjiJ9RLubyjL1Z9C2Y47Va/zJ2u/C3k05baPXoU71Vdbu9hTU
 ++7hu2X2CnzCdmN0iQlifr6WchCM4NFAhWnQtbYLa+PPC/v+P2R1RYKCug5oiYnt
 LC8MiqBY7L2caMToTQZS7VYv+vG7Si9pQ6Nomyo+h+kwSAYKlLafiWsnNe2qL5y+
 WN+463tMb7aOaduigoprOn2XJlCvlw1SoKtVMsT2Yt+JinvoQLQXHUsxbd+AiKgq
 lIsmu7R3GO7X+EwN6FfWl83Dr5sD/tHcb5xvj42kHLiASSJ/xao94lFeUYnidzlW
 QBH5HavpbxgJQrKO4LsyozRqYvLv43kqjeqbGt8GoN3vzlr4ctau7cceR+30p/OX
 OTE54bBqod2D
 =QDUD
 -----END PGP SIGNATURE-----

Merge tag 'pm-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "Fix a recently introduced build issue in the cpufreq SCMI driver
  (Sudeep Holla)"

* tag 'pm-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: scmi: Fix build for !CONFIG_COMMON_CLK
This commit is contained in:
Linus Torvalds 2020-11-26 11:17:37 -08:00
commit 85a2c56cb4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cpufreq/scmi-cpufreq.c
View File

@ -236,13 +236,15 @@ static int scmi_cpufreq_probe(struct scmi_device *sdev)
if (!handle || !handle->perf_ops)
return -ENODEV;
#ifdef CONFIG_COMMON_CLK
/* dummy clock provider as needed by OPP if clocks property is used */
if (of_find_property(dev->of_node, "#clock-cells", NULL))
devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, NULL);
#endif
ret = cpufreq_register_driver(&scmi_cpufreq_driver);
if (ret) {
dev_err(&sdev->dev, "%s: registering cpufreq failed, err: %d\n",
dev_err(dev, "%s: registering cpufreq failed, err: %d\n",
__func__, ret);
}