Merge tag 'ovl-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

[linux-2.6-microblaze.git] / drivers / cpufreq / armada-37xx-cpufreq.c

diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c
index e4782f5..3fc98a3 100644 (file)
--- a/drivers/cpufreq/armada-37xx-cpufreq.c
+++ b/drivers/cpufreq/armada-37xx-cpufreq.c
@@ -86,6 +86,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;
@@ -400,7 +402,7 @@ static int __init armada37xx_cpufreq_driver_init(void)
        struct armada_37xx_dvfs *dvfs;
        struct platform_device *pdev;
        unsigned long freq;
-       unsigned int cur_frequency, base_frequency;
+       unsigned int base_frequency;
        struct regmap *nb_clk_base, *nb_pm_base, *avs_base;
        struct device *cpu_dev;
        int load_lvl, ret;
@@ -461,14 +463,6 @@ static int __init armada37xx_cpufreq_driver_init(void)
                return -EINVAL;
        }
 
-       /* Get nominal (current) CPU frequency */
-       cur_frequency = clk_get_rate(clk);
-       if (!cur_frequency) {
-               dev_err(cpu_dev, "Failed to get clock rate for CPU\n");
-               clk_put(clk);
-               return -EINVAL;
-       }
-
        dvfs = armada_37xx_cpu_freq_info_get(base_frequency);
        if (!dvfs) {
                clk_put(clk);
@@ -514,6 +508,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:
@@ -532,6 +529,26 @@ remove_opp:
 /* 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" },
        { },