Commit 83710aaf authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge tag 'devfreq-next-for-6.12' of...

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
parents da3ea350 d4755212
...@@ -160,7 +160,6 @@ static void exynos_bus_exit(struct device *dev) ...@@ -160,7 +160,6 @@ static void exynos_bus_exit(struct device *dev)
platform_device_unregister(bus->icc_pdev); platform_device_unregister(bus->icc_pdev);
dev_pm_opp_of_remove_table(dev); dev_pm_opp_of_remove_table(dev);
clk_disable_unprepare(bus->clk);
dev_pm_opp_put_regulators(bus->opp_token); dev_pm_opp_put_regulators(bus->opp_token);
} }
...@@ -171,7 +170,6 @@ static void exynos_bus_passive_exit(struct device *dev) ...@@ -171,7 +170,6 @@ static void exynos_bus_passive_exit(struct device *dev)
platform_device_unregister(bus->icc_pdev); platform_device_unregister(bus->icc_pdev);
dev_pm_opp_of_remove_table(dev); dev_pm_opp_of_remove_table(dev);
clk_disable_unprepare(bus->clk);
} }
static int exynos_bus_parent_parse_of(struct device_node *np, 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, ...@@ -247,23 +245,16 @@ static int exynos_bus_parse_of(struct device_node *np,
int ret; int ret;
/* Get the clock to provide each bus with source clock */ /* Get the clock to provide each bus with source clock */
bus->clk = devm_clk_get(dev, "bus"); bus->clk = devm_clk_get_enabled(dev, "bus");
if (IS_ERR(bus->clk)) { if (IS_ERR(bus->clk))
dev_err(dev, "failed to get bus clock\n"); return dev_err_probe(dev, PTR_ERR(bus->clk),
return PTR_ERR(bus->clk); "failed to get bus clock\n");
}
ret = clk_prepare_enable(bus->clk);
if (ret < 0) {
dev_err(dev, "failed to get enable clock\n");
return ret;
}
/* Get the freq and voltage from OPP table to scale the bus freq */ /* Get the freq and voltage from OPP table to scale the bus freq */
ret = dev_pm_opp_of_add_table(dev); ret = dev_pm_opp_of_add_table(dev);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to get OPP table\n"); dev_err(dev, "failed to get OPP table\n");
goto err_clk; return ret;
} }
rate = clk_get_rate(bus->clk); rate = clk_get_rate(bus->clk);
...@@ -281,8 +272,6 @@ static int exynos_bus_parse_of(struct device_node *np, ...@@ -281,8 +272,6 @@ static int exynos_bus_parse_of(struct device_node *np,
err_opp: err_opp:
dev_pm_opp_of_remove_table(dev); dev_pm_opp_of_remove_table(dev);
err_clk:
clk_disable_unprepare(bus->clk);
return ret; return ret;
} }
...@@ -453,7 +442,6 @@ static int exynos_bus_probe(struct platform_device *pdev) ...@@ -453,7 +442,6 @@ static int exynos_bus_probe(struct platform_device *pdev)
err: err:
dev_pm_opp_of_remove_table(dev); dev_pm_opp_of_remove_table(dev);
clk_disable_unprepare(bus->clk);
err_reg: err_reg:
dev_pm_opp_put_regulators(bus->opp_token); dev_pm_opp_put_regulators(bus->opp_token);
......
...@@ -58,4 +58,5 @@ static void __exit devfreq_performance_exit(void) ...@@ -58,4 +58,5 @@ static void __exit devfreq_performance_exit(void)
return; return;
} }
module_exit(devfreq_performance_exit); module_exit(devfreq_performance_exit);
MODULE_DESCRIPTION("DEVFREQ Performance governor");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -58,4 +58,5 @@ static void __exit devfreq_powersave_exit(void) ...@@ -58,4 +58,5 @@ static void __exit devfreq_powersave_exit(void)
return; return;
} }
module_exit(devfreq_powersave_exit); module_exit(devfreq_powersave_exit);
MODULE_DESCRIPTION("DEVFREQ Powersave governor");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -140,4 +140,5 @@ static void __exit devfreq_simple_ondemand_exit(void) ...@@ -140,4 +140,5 @@ static void __exit devfreq_simple_ondemand_exit(void)
return; return;
} }
module_exit(devfreq_simple_ondemand_exit); module_exit(devfreq_simple_ondemand_exit);
MODULE_DESCRIPTION("DEVFREQ Simple On-demand governor");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -153,4 +153,5 @@ static void __exit devfreq_userspace_exit(void) ...@@ -153,4 +153,5 @@ static void __exit devfreq_userspace_exit(void)
return; return;
} }
module_exit(devfreq_userspace_exit); module_exit(devfreq_userspace_exit);
MODULE_DESCRIPTION("DEVFREQ Userspace governor");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -59,7 +59,7 @@ static int imx_bus_init_icc(struct device *dev) ...@@ -59,7 +59,7 @@ static int imx_bus_init_icc(struct device *dev)
struct imx_bus *priv = dev_get_drvdata(dev); struct imx_bus *priv = dev_get_drvdata(dev);
const char *icc_driver_name; 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; return 0;
if (!IS_ENABLED(CONFIG_INTERCONNECT_IMX)) { if (!IS_ENABLED(CONFIG_INTERCONNECT_IMX)) {
dev_warn(dev, "imx interconnect drivers disabled\n"); dev_warn(dev, "imx interconnect drivers disabled\n");
......
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