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

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

Merge back earlier cpufreq material for 4.20.

parents d51aea13 d1e13031

drivers/cpufreq/cpufreq-dt-platdev.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static const struct of_device_id whitelist[] __initconst = { 
	{ .compatible = "renesas,r8a73a4", },

	{ .compatible = "renesas,r8a7740", },

	{ .compatible = "renesas,r8a7743", },

	{ .compatible = "renesas,r8a7744", },

	{ .compatible = "renesas,r8a7745", },

	{ .compatible = "renesas,r8a7778", },

	{ .compatible = "renesas,r8a7779", },

drivers/cpufreq/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_transition_begin); 
void cpufreq_freq_transition_end(struct cpufreq_policy *policy,

		struct cpufreq_freqs *freqs, int transition_failed)

{

	if (unlikely(WARN_ON(!policy->transition_ongoing)))

	if (WARN_ON(!policy->transition_ongoing))

		return;



	cpufreq_notify_post_transition(policy, freqs, transition_failed);

drivers/cpufreq/s5pv210-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -611,8 +611,8 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev) 
	for_each_compatible_node(np, NULL, "samsung,s5pv210-dmc") {

		id = of_alias_get_id(np, "dmc");

		if (id < 0 || id >= ARRAY_SIZE(dmc_base)) {

			pr_err("%s: failed to get alias of dmc node '%s'\n",

				__func__, np->name);

			pr_err("%s: failed to get alias of dmc node '%pOFn'\n",

				__func__, np);

			of_node_put(np);

			return id;

		}