cpufreq / intel_pstate: Fix calculation of current frequency

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / cpufreq-cpu0.c

diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
index debc5a7c8db6207feeb9c428ccc44b8fcaed8d2f..4e5b7fb8927cb5304e3baf37dc3ccb87e71c31b9 100644 (file)
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@ -12,12 +12,12 @@
 #define pr_fmt(fmt)    KBUILD_MODNAME ": " fmt
 
 #include <linux/clk.h>
-#include <linux/cpu.h>
 #include <linux/cpufreq.h>
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/opp.h>
+#include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 
@@ -146,7 +146,6 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy)
         * share the clock and voltage and clock.  Use cpufreq affected_cpus
         * interface to have all CPUs scaled together.
         */
-       policy->shared_type = CPUFREQ_SHARED_TYPE_ANY;
        cpumask_setall(policy->cpus);
 
        cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
@@ -177,34 +176,32 @@ static struct cpufreq_driver cpu0_cpufreq_driver = {
        .attr = cpu0_cpufreq_attr,
 };
 
-static int cpu0_cpufreq_driver_init(void)
+static int cpu0_cpufreq_probe(struct platform_device *pdev)
 {
        struct device_node *np;
        int ret;
 
-       np = of_find_node_by_path("/cpus/cpu@0");
+       for_each_child_of_node(of_find_node_by_path("/cpus"), np) {
+               if (of_get_property(np, "operating-points", NULL))
+                       break;
+       }
+
        if (!np) {
                pr_err("failed to find cpu0 node\n");
                return -ENOENT;
        }
 
-       cpu_dev = get_cpu_device(0);
-       if (!cpu_dev) {
-               pr_err("failed to get cpu0 device\n");
-               ret = -ENODEV;
-               goto out_put_node;
-       }
-
+       cpu_dev = &pdev->dev;
        cpu_dev->of_node = np;
 
-       cpu_clk = clk_get(cpu_dev, NULL);
+       cpu_clk = devm_clk_get(cpu_dev, NULL);
        if (IS_ERR(cpu_clk)) {
                ret = PTR_ERR(cpu_clk);
                pr_err("failed to get cpu0 clock: %d\n", ret);
                goto out_put_node;
        }
 
-       cpu_reg = regulator_get(cpu_dev, "cpu0");
+       cpu_reg = devm_regulator_get(cpu_dev, "cpu0");
        if (IS_ERR(cpu_reg)) {
                pr_warn("failed to get cpu0 regulator\n");
                cpu_reg = NULL;
@@ -267,7 +264,24 @@ out_put_node:
        of_node_put(np);
        return ret;
 }
-late_initcall(cpu0_cpufreq_driver_init);
+
+static int cpu0_cpufreq_remove(struct platform_device *pdev)
+{
+       cpufreq_unregister_driver(&cpu0_cpufreq_driver);
+       opp_free_cpufreq_table(cpu_dev, &freq_table);
+
+       return 0;
+}
+
+static struct platform_driver cpu0_cpufreq_platdrv = {
+       .driver = {
+               .name   = "cpufreq-cpu0",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = cpu0_cpufreq_probe,
+       .remove         = cpu0_cpufreq_remove,
+};
+module_platform_driver(cpu0_cpufreq_platdrv);
 
 MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
 MODULE_DESCRIPTION("Generic CPU0 cpufreq driver");