Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaad568d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpufreq: Move governor-per-policy parsing before parsing freq table"

parents 1fd8f878 e74b75d7

drivers/cpufreq/qcom-cpufreq.c

+4 −4
Original line number Diff line number Diff line
@@ -438,6 +438,10 @@ static int __init msm_cpufreq_probe(struct platform_device *pdev) 
	}

	hotplug_ready = true;



	/* Use per-policy governor tunable for some targets */

	if (of_property_read_bool(dev->of_node, "qcom,governor-per-policy"))

		msm_cpufreq_driver.flags |= CPUFREQ_HAVE_GOVERNOR_PER_POLICY;



	/* Parse commong cpufreq table for all CPUs */

	ftbl = cpufreq_parse_dt(dev, "qcom,cpufreq-table", 0);

	if (!IS_ERR(ftbl)) {
@@ -483,10 +487,6 @@ static int __init msm_cpufreq_probe(struct platform_device *pdev) 
		per_cpu(freq_table, cpu) = ftbl;

	}



	/* Use per-policy governor tunable for some targets */

	if (of_property_read_bool(dev->of_node, "qcom,governor-per-policy"))

		msm_cpufreq_driver.flags |= CPUFREQ_HAVE_GOVERNOR_PER_POLICY;



	return 0;

}