openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Power management update for 5.7-rc2 

Allow the operating performance points (OPP) core to be used in
 the case when the same driver is used on different platforms,
 some of which have an OPP table and some of which have a clock
 node (Rajendra Nayak).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAl6ZuBESHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRx6tQP/3eBHKn8tJqGyKFWf0A08y1QhzuH095+
 oOOAyekjV7g8j7sOyYGgmNbcxc02KkM6+TsWbSKCXMCKJ9dzAi2CfMQIQz3hiPnf
 3Moc7dmKV6ZrEO87qbuU2V6O2Dmv3SXugIoVEubcS+k4j1FHABE72YPKoJ5aqyM/
 oafSghRd+gwJcLrHAurUBQwYNMLQiCrX60hRglENxZQfaeMp/aZ/zGXwrFPhdmPh
 eNssdHPpCWbfGQYkqMjIJ5xw9KMMJtxvSKpmnQp1Z7vBZnoYJ+CypAULnPt1ATNz
 EngVt3WqY9VG38RtcOFWfZXlMQiCeQzO78PP9WR/asDySCL79OwNVPozvEi85keT
 SCCdFyrVf7c6HzGpRC3I8r1hzVmC707S9ScQ5255WiaUpCdFTIYPNzrcAWIvmf6m
 c6J/nNS++HAleaeb9Idu6QvBG15en9vj9R5nuI2UOOjk+qXzQmYFVw7IM7aF1nlN
 wULMVhpszkqtGLbS/LS/Xcc4ikNda4V5dlLBawBkRzSjJlb5Qm4IjliJpO8ajfZu
 1gtdpfkSRGJMGNtT364RsA6ObCPf6xbgSYoL5pDr5xnZggGyf/vjGd/hJ1ECHR0z
 oVLIJqIYLqWBlIiXi+08pQNIxh37Kh7c11TSP/6F8tOPR7FopS56svyLRr7R+RFI
 xXSEaXKC1Z3w
 =+9n1
 -----END PGP SIGNATURE-----

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

Pull power management update from Rafael Wysocki:
 "Allow the operating performance points (OPP) core to be used in the
  case when the same driver is used on different platforms, some of
  which have an OPP table and some of which have a clock node (Rajendra
  Nayak)"

* tag 'pm-5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  opp: Manage empty OPP tables with clk handle
This commit is contained in:
Linus Torvalds 2020-04-17 09:56:28 -07:00
parent c8a6552ff1 2c127c46ec
commit 5a32fe48bc
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/opp/core.c
View File

@ -819,6 +819,8 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
if (unlikely(!target_freq)) { if (unlikely(!target_freq)) {
if (opp_table->required_opp_tables) { if (opp_table->required_opp_tables) {
ret = _set_required_opps(dev, opp_table, NULL); ret = _set_required_opps(dev, opp_table, NULL);
} else if (!_get_opp_count(opp_table)) {
return 0;
} else { } else {
dev_err(dev, "target frequency can't be 0\n"); dev_err(dev, "target frequency can't be 0\n");
ret = -EINVAL; ret = -EINVAL;
@ -849,6 +851,18 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
goto put_opp_table; goto put_opp_table;
} }
/*
* For IO devices which require an OPP on some platforms/SoCs
* while just needing to scale the clock on some others
* we look for empty OPP tables with just a clock handle and
* scale only the clk. This makes dev_pm_opp_set_rate()
* equivalent to a clk_set_rate()
*/
if (!_get_opp_count(opp_table)) {
ret = _generic_set_opp_clk_only(dev, clk, freq);
goto put_opp_table;
}
temp_freq = old_freq; temp_freq = old_freq;
old_opp = _find_freq_ceil(opp_table, &temp_freq); old_opp = _find_freq_ceil(opp_table, &temp_freq);
if (IS_ERR(old_opp)) { if (IS_ERR(old_opp)) {