Commit a87a1096 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'cpufreq/arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Pull ARM cpufreq fixes for v5.14 from Viresh Kumar:

"This contains:

 - Addition of SoCs to blocklist for cpufreq-dt driver (Bjorn Andersson
   and Thara Gopinath).

 - Fix error path for scmi driver (Lukasz Luba).

 - Temporarily disable highest frequency for armada, its unsafe and
   breaks stuff."

* 'cpufreq/arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: armada-37xx: forbid cpufreq for 1.2 GHz variant
  cpufreq: blocklist Qualcomm sm8150 in cpufreq-dt-platdev
  cpufreq: arm_scmi: Fix error path when allocation failed
  cpufreq: blacklist Qualcomm sc8180x in cpufreq-dt-platdev
parents 7c60610d 484f2b7c

drivers/cpufreq/armada-37xx-cpufreq.c

+5 −1
Original line number Diff line number Diff line
@@ -104,7 +104,11 @@ struct armada_37xx_dvfs { 
};



static struct armada_37xx_dvfs armada_37xx_dvfs[] = {

	{.cpu_freq_max = 1200*1000*1000, .divider = {1, 2, 4, 6} },

	/*

	 * The cpufreq scaling for 1.2 GHz variant of the SOC is currently

	 * unstable because we do not know how to configure it properly.

	 */

	/* {.cpu_freq_max = 1200*1000*1000, .divider = {1, 2, 4, 6} }, */

	{.cpu_freq_max = 1000*1000*1000, .divider = {1, 2, 4, 5} },

	{.cpu_freq_max = 800*1000*1000,  .divider = {1, 2, 3, 4} },

	{.cpu_freq_max = 600*1000*1000,  .divider = {2, 4, 5, 6} },

drivers/cpufreq/cpufreq-dt-platdev.c

+2 −0
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ static const struct of_device_id blocklist[] __initconst = { 
	{ .compatible = "qcom,qcs404", },

	{ .compatible = "qcom,sc7180", },

	{ .compatible = "qcom,sc7280", },

	{ .compatible = "qcom,sc8180x", },

	{ .compatible = "qcom,sdm845", },

	{ .compatible = "qcom,sm8150", },



	{ .compatible = "st,stih407", },

	{ .compatible = "st,stih410", },

drivers/cpufreq/scmi-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy) 
	}



	if (!zalloc_cpumask_var(&opp_shared_cpus, GFP_KERNEL))

		ret = -ENOMEM;

		return -ENOMEM;



	/* Obtain CPUs that share SCMI performance controls */

	ret = scmi_get_sharing_cpus(cpu_dev, policy->cpus);