54bc65b3bb
* Bump rockchip DEV 32b to 5.11.y * Move mvebu64 DEV to 5.11.y * Move Rockchip64 DEV to 5.11.y Disabling general-rkvdec_nv15.patch - need more attention * Add Meson DEV / Odroid C1 * Move OdroidXU4 DEV to tobetter's 5.11.y branch * Bump sunxi DEV to 5.11.y * Bump mvebu DEV to 5.11.y
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
From 1c2f3373daa919d624f6c28d0d3b024aec5bf55c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Tue, 20 Oct 2020 17:04:17 +0200
|
|
Subject: [PATCH 10/10] cpufreq: armada-37xx: Fix module unloading
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This driver is missing module_exit hook. Add proper driver exit function
|
|
which unregisters the platform device and cleans up the data.
|
|
|
|
Signed-off-by: Pali Rohár <pali@kernel.org>
|
|
---
|
|
drivers/cpufreq/armada-37xx-cpufreq.c | 25 +++++++++++++++++++++++++
|
|
1 file changed, 25 insertions(+)
|
|
|
|
diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c
|
|
index f13646d143de..565c40f536ef 100644
|
|
--- a/drivers/cpufreq/armada-37xx-cpufreq.c
|
|
+++ b/drivers/cpufreq/armada-37xx-cpufreq.c
|
|
@@ -85,6 +85,8 @@ static int avs_map[] = {
|
|
};
|
|
|
|
struct armada37xx_cpufreq_state {
|
|
+ struct platform_device *pdev;
|
|
+ struct device *cpu_dev;
|
|
struct regmap *regmap;
|
|
u32 nb_l0l1;
|
|
u32 nb_l2l3;
|
|
@@ -495,6 +497,9 @@ static int __init armada37xx_cpufreq_driver_init(void)
|
|
if (ret)
|
|
goto disable_dvfs;
|
|
|
|
+ armada37xx_cpufreq_state->cpu_dev = cpu_dev;
|
|
+ armada37xx_cpufreq_state->pdev = pdev;
|
|
+ platform_set_drvdata(pdev, dvfs);
|
|
return 0;
|
|
|
|
disable_dvfs:
|
|
@@ -513,6 +518,26 @@ static int __init armada37xx_cpufreq_driver_init(void)
|
|
/* late_initcall, to guarantee the driver is loaded after A37xx clock driver */
|
|
late_initcall(armada37xx_cpufreq_driver_init);
|
|
|
|
+static void __exit armada37xx_cpufreq_driver_exit(void)
|
|
+{
|
|
+ struct platform_device *pdev = armada37xx_cpufreq_state->pdev;
|
|
+ struct armada_37xx_dvfs *dvfs = platform_get_drvdata(pdev);
|
|
+ unsigned long freq;
|
|
+ int load_lvl;
|
|
+
|
|
+ platform_device_unregister(pdev);
|
|
+
|
|
+ armada37xx_cpufreq_disable_dvfs(armada37xx_cpufreq_state->regmap);
|
|
+
|
|
+ for (load_lvl = ARMADA_37XX_DVFS_LOAD_0; load_lvl < LOAD_LEVEL_NR; load_lvl++) {
|
|
+ freq = dvfs->cpu_freq_max / dvfs->divider[load_lvl];
|
|
+ dev_pm_opp_remove(armada37xx_cpufreq_state->cpu_dev, freq);
|
|
+ }
|
|
+
|
|
+ kfree(armada37xx_cpufreq_state);
|
|
+}
|
|
+module_exit(armada37xx_cpufreq_driver_exit);
|
|
+
|
|
static const struct of_device_id __maybe_unused armada37xx_cpufreq_of_match[] = {
|
|
{ .compatible = "marvell,armada-3700-nb-pm" },
|
|
{ },
|
|
--
|
|
2.25.1
|
|
|