diff --git a/drivers/amlogic/cpufreq/meson-cpufreq.c b/drivers/amlogic/cpufreq/meson-cpufreq.c index 996b63bdc5d7..26ebcd049b6b 100644 --- a/drivers/amlogic/cpufreq/meson-cpufreq.c +++ b/drivers/amlogic/cpufreq/meson-cpufreq.c @@ -261,11 +261,9 @@ static int meson_cpufreq_set_target(struct cpufreq_policy *policy, } } - if (cur_cluster == 0) { - freqs.old = freq_old / 1000; - freqs.new = freq_new / 1000; - cpufreq_freq_transition_begin(policy, &freqs); - } + freqs.old = freq_old / 1000; + freqs.new = freq_new / 1000; + cpufreq_freq_transition_begin(policy, &freqs); /*scale clock frequency*/ ret = meson_cpufreq_set_rate(policy, cur_cluster, freq_new / 1000); @@ -280,8 +278,7 @@ static int meson_cpufreq_set_target(struct cpufreq_policy *policy, return ret; } - if (cur_cluster == 0) - cpufreq_freq_transition_end(policy, &freqs, ret); + cpufreq_freq_transition_end(policy, &freqs, ret); /*cpufreq down,change voltage after frequency*/ if (freq_new < freq_old) { ret = meson_regulator_set_volate(cpu_reg, volt_old, @@ -289,16 +286,13 @@ static int meson_cpufreq_set_target(struct cpufreq_policy *policy, if (ret) { pr_err("failed to scale volt %u %u down: %d\n", volt_new, volt_tol, ret); - if (cur_cluster == 0) { - freqs.old = freq_new / 1000; - freqs.new = freq_old / 1000; - cpufreq_freq_transition_begin(policy, &freqs); - } + freqs.old = freq_new / 1000; + freqs.new = freq_old / 1000; + cpufreq_freq_transition_begin(policy, &freqs); ret = meson_cpufreq_set_rate(policy, cur_cluster, freq_old / 1000); - if (cur_cluster == 0) - cpufreq_freq_transition_end(policy, + cpufreq_freq_transition_end(policy, &freqs, ret); } }