Merge back earlier cpufreq material for v5.1.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/cpufreq/scmi-cpufreq.c
index 9ed46d188cb5ba3fee03ac61623bf8f531ec6dae,66b633b48eb17faafd40e0f1dec42ebcb81cc3ec..c47182fc64eadb914cc3d631defd6fe2d7697a0d
--- 1/drivers/cpufreq/scmi-cpufreq.c
--- 2/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@@ -185,10 -183,9 +183,9 @@@ static int scmi_cpufreq_exit(struct cpu
  {
        struct scmi_data *priv = policy->driver_data;
  
-       cpufreq_cooling_unregister(priv->cdev);
        dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
 -      kfree(priv);
        dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
 +      kfree(priv);
  
        return 0;
  }