1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c
index 99449738faa4..3f49427766b8 100644
--- a/drivers/cpufreq/scpi-cpufreq.c
+++ b/drivers/cpufreq/scpi-cpufreq.c
@@ -22,7 +22,6 @@
 #include <linux/cpu.h>
 #include <linux/cpufreq.h>
 #include <linux/cpumask.h>
-#include <linux/cpu_cooling.h>
 #include <linux/export.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
@@ -34,7 +33,6 @@
 struct scpi_data {
         struct clk *clk;
         struct device *cpu_dev;
-        struct thermal_cooling_device *cdev;
 };
 
 static struct scpi_ops *scpi_ops;
@@ -170,6 +168,9 @@ static int scpi_cpufreq_init(struct cpufreq_policy *policy)
         policy->cpuinfo.transition_latency = latency;
 
         policy->fast_switch_possible = false;
+
+        dev_pm_opp_of_register_em(policy->cpus);
+
         return 0;
 
 out_free_cpufreq_table:
@@ -186,7 +187,6 @@ static int scpi_cpufreq_exit(struct cpufreq_policy *policy)
 {
         struct scpi_data *priv = policy->driver_data;
 
-        cpufreq_cooling_unregister(priv->cdev);
         clk_put(priv->clk);
         dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
         kfree(priv);
@@ -195,23 +195,16 @@ static int scpi_cpufreq_exit(struct cpufreq_policy *policy)
         return 0;
 }
 
-static void scpi_cpufreq_ready(struct cpufreq_policy *policy)
-{
-        struct scpi_data *priv = policy->driver_data;
-
-        priv->cdev = of_cpufreq_cooling_register(policy);
-}
-
 static struct cpufreq_driver scpi_cpufreq_driver = {
         .name   = "scpi-cpufreq",
         .flags  = CPUFREQ_STICKY | CPUFREQ_HAVE_GOVERNOR_PER_POLICY |
-                  CPUFREQ_NEED_INITIAL_FREQ_CHECK,
+                  CPUFREQ_NEED_INITIAL_FREQ_CHECK |
+                  CPUFREQ_IS_COOLING_DEV,
         .verify = cpufreq_generic_frequency_table_verify,
         .attr   = cpufreq_generic_attr,
         .get    = scpi_cpufreq_get_rate,
         .init   = scpi_cpufreq_init,
         .exit   = scpi_cpufreq_exit,
-        .ready  = scpi_cpufreq_ready,
         .target_index   = scpi_cpufreq_set_target,
 };