github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 07:33:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Update devfreq next for v6.12

Browse Source 
Detailed description for this pull request:
 - Add missing MODULE_DESCRIPTION() macros for devfreq governors.
 - Use Use devm_clk_get_enabled() helpers for exyns-bus devfreq driver.
 - Use of_property_present() instead of of_get_property() for imx-bus devfreq driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEsSpuqBtbWtRe4rLGnM3fLN7rz1MFAmbdtbYACgkQnM3fLN7r
 z1N+rg//ZDlHhg8j9aAyuKVg/UADDHB4vORvrcvncdzzVTr3YHUhpJORpD3LipGv
 ONEevA9UpzknYIqH7l28GKz0Ouo6A2Ukq87b8F9lIFjNCwjH0fsGNtEtwj6QLhVp
 Ay1bRN/5K4zYGzF0SC92v5Goqw5OJjQJlWdZHVr3KqejzJsFMGdg76LXeZYb4ITg
 IpLvebe7m1dmZ8jfuoH4NQShHdUFHWthdaUmIwT/Lub4izFCWJTAtjnwgXhjdIcg
 Eq7H1ti5ti+rWQqAZeu5bVABvd/1qp0Fgk5sxTk+V7vrMpmAieNiTJhzM0x7GtUV
 aeJFRwU1Q1Jz57hgqOumH/0oAaD381iE8LqR9QprafPH3AyAeIj/sKLsgrcGQYp+
 0kynbTz13rJ1bpE6FDZB8PXQLJqcm3H5+c+5OEaSJlNnNHWNl6uiOh1K2GGVxiUG
 UR/dOo6o6xhUINIENcMabUwrDIkIiGn7P08UYenbeWYLwR/nTOfAQFtiBJL/MOCW
 SFBGogY5cr46kwDUE/a+D3uYXe69E2P8bwk4znmn9HqUEcmMP/kpeWGpe7OvTvC6
 dFibyj+LI2+lUsWvryzwbTg44pI+UYHqzdnU0zTBbVNyX0WRyhFfYXUF6yUDTYrF
 yCBxs0414r69RHh4dIr76Xq3XvjghD36tipJUNRhDFoITjuMQR0=
 =LTmE
 -----END PGP SIGNATURE-----

Merge tag 'devfreq-next-for-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux

Merge devfreq updates for v6.12 from Chanwoo Choi:

"Detailed description for this pull request:
 - Add missing MODULE_DESCRIPTION() macros for devfreq governors.
 - Use Use devm_clk_get_enabled() helpers for exyns-bus devfreq driver.
 - Use of_property_present() instead of of_get_property() for imx-bus
   devfreq driver."

* tag 'devfreq-next-for-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux:
  PM / devfreq: imx-bus: Use of_property_present()
  PM / devfreq: exynos: Use Use devm_clk_get_enabled() helpers
  PM/devfreq: governor: add missing MODULE_DESCRIPTION() macros
This commit is contained in:
Rafael J. Wysocki 2024-09-09 18:33:15 +02:00
commit 83710aaff0
6 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/devfreq/exynos-bus.c
View File

@ -160,7 +160,6 @@ static void exynos_bus_exit(struct device *dev)
platform_device_unregister(bus->icc_pdev);
dev_pm_opp_of_remove_table(dev);
clk_disable_unprepare(bus->clk);
dev_pm_opp_put_regulators(bus->opp_token);
}
@ -171,7 +170,6 @@ static void exynos_bus_passive_exit(struct device *dev)
platform_device_unregister(bus->icc_pdev);
dev_pm_opp_of_remove_table(dev);
clk_disable_unprepare(bus->clk);
}
static int exynos_bus_parent_parse_of(struct device_node *np,
@ -247,23 +245,16 @@ static int exynos_bus_parse_of(struct device_node *np,
int ret;
/* Get the clock to provide each bus with source clock */
bus->clk = devm_clk_get(dev, "bus");
if (IS_ERR(bus->clk)) {
dev_err(dev, "failed to get bus clock\n");
return PTR_ERR(bus->clk);
}
ret = clk_prepare_enable(bus->clk);
if (ret < 0) {
dev_err(dev, "failed to get enable clock\n");
return ret;
}
bus->clk = devm_clk_get_enabled(dev, "bus");
if (IS_ERR(bus->clk))
return dev_err_probe(dev, PTR_ERR(bus->clk),
"failed to get bus clock\n");
/* Get the freq and voltage from OPP table to scale the bus freq */
ret = dev_pm_opp_of_add_table(dev);
if (ret < 0) {
dev_err(dev, "failed to get OPP table\n");
goto err_clk;
return ret;
}
rate = clk_get_rate(bus->clk);
@ -281,8 +272,6 @@ static int exynos_bus_parse_of(struct device_node *np,
err_opp:
dev_pm_opp_of_remove_table(dev);
err_clk:
clk_disable_unprepare(bus->clk);
return ret;
}
@ -453,7 +442,6 @@ static int exynos_bus_probe(struct platform_device *pdev)
err:
dev_pm_opp_of_remove_table(dev);
clk_disable_unprepare(bus->clk);
err_reg:
dev_pm_opp_put_regulators(bus->opp_token);

1
drivers/devfreq/governor_performance.c
View File

@ -58,4 +58,5 @@ static void __exit devfreq_performance_exit(void)
return;
}
module_exit(devfreq_performance_exit);
MODULE_DESCRIPTION("DEVFREQ Performance governor");
MODULE_LICENSE("GPL");

1
drivers/devfreq/governor_powersave.c
View File

@ -58,4 +58,5 @@ static void __exit devfreq_powersave_exit(void)
return;
}
module_exit(devfreq_powersave_exit);
MODULE_DESCRIPTION("DEVFREQ Powersave governor");
MODULE_LICENSE("GPL");

1
drivers/devfreq/governor_simpleondemand.c
View File

@ -140,4 +140,5 @@ static void __exit devfreq_simple_ondemand_exit(void)
return;
}
module_exit(devfreq_simple_ondemand_exit);
MODULE_DESCRIPTION("DEVFREQ Simple On-demand governor");
MODULE_LICENSE("GPL");

1
drivers/devfreq/governor_userspace.c
View File

@ -153,4 +153,5 @@ static void __exit devfreq_userspace_exit(void)
return;
}
module_exit(devfreq_userspace_exit);
MODULE_DESCRIPTION("DEVFREQ Userspace governor");
MODULE_LICENSE("GPL");

2
drivers/devfreq/imx-bus.c
View File

@ -59,7 +59,7 @@ static int imx_bus_init_icc(struct device *dev)
struct imx_bus *priv = dev_get_drvdata(dev);
const char *icc_driver_name;
if (!of_get_property(dev->of_node, "#interconnect-cells", NULL))
if (!of_property_present(dev->of_node, "#interconnect-cells"))
return 0;
if (!IS_ENABLED(CONFIG_INTERCONNECT_IMX)) {
dev_warn(dev, "imx interconnect drivers disabled\n");