mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Rhyland Klein <rklein@nvidia.com>
To: Peter De Schrijver <pdeschrijver@nvidia.com>
Cc: Mike Turquette <mturquette@linaro.org>,
	Stephen Warren <swarren@wwwdotorg.org>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Thierry Reding <thierry.reding@gmail.com>,
	Alexandre Courbot <gnurou@gmail.com>,
	Bill Huang <bilhuang@nvidia.com>,
	Paul Walmsley <pwalmsley@nvidia.com>,
	linux-clk@vger.kernel.org, linux-tegra@vger.kernel.org,
	linux-kernel@vger.kernel.org, Rhyland Klein <rklein@nvidia.com>
Subject: [PATCH 17/19] clk: tegra: pll: Fix _pll_ramp_calc_pll logic
Date: Fri, 24 Apr 2015 12:47:57 -0400	[thread overview]
Message-ID: <1429894079-25052-18-git-send-email-rklein@nvidia.com> (raw)
In-Reply-To: <1429894079-25052-1-git-send-email-rklein@nvidia.com>

This removes the conversion from pdiv to hw, which is already taken
care of by _get_table_rate before this code is run. This avoids
incorrectly converting pdiv to hw twice and getting the wrong hw value.

Signed-off-by: Rhyland Klein <rklein@nvidia.com>
---
 drivers/clk/tegra/clk-pll.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
index 68b42be060c7..fdf322015d76 100644
--- a/drivers/clk/tegra/clk-pll.c
+++ b/drivers/clk/tegra/clk-pll.c
@@ -1038,7 +1038,7 @@ static int _pll_ramp_calc_pll(struct clk_hw *hw,
 			      unsigned long rate, unsigned long parent_rate)
 {
 	struct tegra_clk_pll *pll = to_clk_pll(hw);
-	int err = 0, p_div;
+	int err = 0;
 
 	err = _get_table_rate(hw, cfg, rate, parent_rate);
 	if (err < 0)
@@ -1049,11 +1049,6 @@ static int _pll_ramp_calc_pll(struct clk_hw *hw,
 			err = -EINVAL;
 			goto out;
 		}
-		p_div = _p_div_to_hw(hw, cfg->p);
-		if (p_div < 0)
-			return p_div;
-		else
-			cfg->p = p_div;
 	}
 
 	if (cfg->p >  pll->params->max_p)
-- 
1.7.9.5


  parent reply	other threads:[~2015-04-24 16:50 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-24 16:47 [PATCH 00/19] Tegra210 Clock Support Rhyland Klein
2015-04-24 16:47 ` [PATCH 01/19] clk: tegra: Modify tegra_audio_clk_init to accept more plls Rhyland Klein
2015-04-24 16:47 ` [PATCH 02/19] clk: tegra: periph: add new periph clks and muxes for Tegra210 Rhyland Klein
2015-04-24 16:47 ` [PATCH 03/19] clk: tegra: pll: add tegra_pll_wait_for_lock to clk header Rhyland Klein
2015-04-24 16:47 ` [PATCH 04/19] clk: tegra: pll: simplify clk_enable_path Rhyland Klein
2015-04-24 16:47 ` [PATCH 05/19] clk: tegra: pll: update warning msg Rhyland Klein
2015-04-24 16:47 ` [PATCH 06/19] clk: tegra: pll-params: change misc_reg count from 3 -> 6 Rhyland Klein
2015-04-24 16:47 ` [PATCH 07/19] clk: tegra: pll: Don't unconditionally set LOCK flags Rhyland Klein
2015-04-24 16:47 ` [PATCH 08/19] clk: tegra: pll: Add logic for handling SDM data Rhyland Klein
2015-04-24 16:47 ` [PATCH 09/19] clk: tegra: pll: Add logic for SS Rhyland Klein
2015-04-24 16:47 ` [PATCH 10/19] clk: tegra: pll: Add logic for out-of-table rates for T210 Rhyland Klein
2015-04-24 16:47 ` [PATCH 11/19] clk: tegra: pll: Add code to handle if resets are supported by PLL Rhyland Klein
2015-04-24 16:47 ` [PATCH 12/19] clk: tegra: pll: Add specialized logic for T210 Rhyland Klein
2015-04-24 16:47 ` [PATCH 13/19] clk: tegra: pll: Add support for PLLMB " Rhyland Klein
2015-04-27 14:10   ` Peter De Schrijver
2015-04-24 16:47 ` [PATCH 14/19] clk: tegra: pll: Adjust vco_min if SDM present Rhyland Klein
2015-04-24 16:47 ` [PATCH 15/19] clk: tegra: pll: Add dyn_ramp callback Rhyland Klein
2015-04-24 16:47 ` [PATCH 16/19] clk: tegra: pll: Add Set_default logic Rhyland Klein
2015-04-27 14:19   ` Peter De Schrijver
2015-04-27 14:30   ` Peter De Schrijver
2015-04-24 16:47 ` Rhyland Klein [this message]
2015-04-24 16:47 ` [PATCH 18/19] clk: tegra: Add Super Gen5 Logic Rhyland Klein
2015-04-24 16:47 ` [PATCH 19/19] clk: tegra210: add support for Tegra210 clocks Rhyland Klein
2015-04-27 14:47   ` Peter De Schrijver

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1429894079-25052-18-git-send-email-rklein@nvidia.com \
    --to=rklein@nvidia.com \
    --cc=bilhuang@nvidia.com \
    --cc=gnurou@gmail.com \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=mturquette@linaro.org \
    --cc=pdeschrijver@nvidia.com \
    --cc=pwalmsley@nvidia.com \
    --cc=sboyd@codeaurora.org \
    --cc=swarren@wwwdotorg.org \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome