PLL_P is known to be always running at 216MHz, hence there is no need to query its rate.
Signed-off-by: Dmitry Osipenko <dig...@gmail.com> --- drivers/cpufreq/tegra20-cpufreq.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/cpufreq/tegra20-cpufreq.c b/drivers/cpufreq/tegra20-cpufreq.c index 05f57dcd5215..3ad6bded6efc 100644 --- a/drivers/cpufreq/tegra20-cpufreq.c +++ b/drivers/cpufreq/tegra20-cpufreq.c @@ -24,6 +24,8 @@ #include <linux/platform_device.h> #include <linux/types.h> +#define PLL_P_FREQ 216000 + static struct cpufreq_frequency_table freq_table[] = { { .frequency = 216000 }, { .frequency = 312000 }, @@ -48,18 +50,15 @@ struct tegra20_cpufreq { static unsigned int tegra_get_intermediate(struct cpufreq_policy *policy, unsigned int index) { - struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data(); - unsigned int ifreq = clk_get_rate(cpufreq->pll_p_clk) / 1000; - /* * Don't switch to intermediate freq if: * - we are already at it, i.e. policy->cur == ifreq * - index corresponds to ifreq */ - if (freq_table[index].frequency == ifreq || policy->cur == ifreq) + if (index == 0 || policy->cur == PLL_P_FREQ) return 0; - return ifreq; + return PLL_P_FREQ; } static int tegra_target_intermediate(struct cpufreq_policy *policy, @@ -93,14 +92,13 @@ static int tegra_target(struct cpufreq_policy *policy, unsigned int index) { struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data(); unsigned long rate = freq_table[index].frequency; - unsigned int ifreq = clk_get_rate(cpufreq->pll_p_clk) / 1000; int ret; /* * target freq == pll_p, don't need to take extra reference to pll_x_clk * as it isn't used anymore. */ - if (rate == ifreq) + if (index == 0) return clk_set_parent(cpufreq->cpu_clk, cpufreq->pll_p_clk); ret = clk_set_rate(cpufreq->pll_x_clk, rate * 1000); -- 2.17.0