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
Subject: [PATCH 09/19] clk: tegra: pll: Add logic for SS
Date: Fri, 24 Apr 2015 12:47:49 -0400 [thread overview]
Message-ID: <1429894079-25052-10-git-send-email-rklein@nvidia.com> (raw)
In-Reply-To: <1429894079-25052-1-git-send-email-rklein@nvidia.com>
From: Bill Huang <bilhuang@nvidia.com>
Add some logic for Spread Spectrum control. It is used in conjuncture
with SDM fractional dividers. SSC has to be disabled when we configure
the divider settings.
Signed-off-by: Bill Huang <bilhuang@nvidia.com>
---
drivers/clk/tegra/clk-pll.c | 25 ++++++++++++++++++++++++-
drivers/clk/tegra/clk.h | 2 ++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
index 31d95cfdf35e..806ae48020e5 100644
--- a/drivers/clk/tegra/clk-pll.c
+++ b/drivers/clk/tegra/clk-pll.c
@@ -624,6 +624,26 @@ static void _update_pll_cpcon(struct tegra_clk_pll *pll,
pll_writel_misc(val, pll);
}
+static void pll_clk_start_ss(struct tegra_clk_pll *pll)
+{
+ if (pll->params->defaults_set && pll->params->ssc_ctrl_en_mask) {
+ u32 val = pll_readl(pll->params->ssc_ctrl_reg, pll);
+
+ val |= pll->params->ssc_ctrl_en_mask;
+ pll_writel(val, pll->params->ssc_ctrl_reg, pll);
+ }
+}
+
+static void pll_clk_stop_ss(struct tegra_clk_pll *pll)
+{
+ if (pll->params->defaults_set && pll->params->ssc_ctrl_en_mask) {
+ u32 val = pll_readl(pll->params->ssc_ctrl_reg, pll);
+
+ val &= ~pll->params->ssc_ctrl_en_mask;
+ pll_writel(val, pll->params->ssc_ctrl_reg, pll);
+ }
+}
+
static int _program_pll(struct clk_hw *hw, struct tegra_clk_pll_freq_table *cfg,
unsigned long rate)
{
@@ -632,8 +652,10 @@ static int _program_pll(struct clk_hw *hw, struct tegra_clk_pll_freq_table *cfg,
state = clk_pll_is_enabled(hw);
- if (state)
+ if (state) {
+ pll_clk_stop_ss(pll);
_clk_pll_disable(hw);
+ }
_update_pll_mnp(pll, cfg);
@@ -643,6 +665,7 @@ static int _program_pll(struct clk_hw *hw, struct tegra_clk_pll_freq_table *cfg,
if (state) {
_clk_pll_enable(hw);
ret = clk_pll_wait_for_lock(pll);
+ pll_clk_start_ss(pll);
}
return ret;
diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h
index ef5754f64622..f3c1f07d5332 100644
--- a/drivers/clk/tegra/clk.h
+++ b/drivers/clk/tegra/clk.h
@@ -219,6 +219,8 @@ struct tegra_clk_pll_params {
u32 sdm_din_mask;
u32 sdm_ctrl_reg;
u32 sdm_ctrl_en_mask;
+ u32 ssc_ctrl_reg;
+ u32 ssc_ctrl_en_mask;
u32 aux_reg;
u32 dyn_ramp_reg;
u32 ext_misc_reg[MAX_PLL_MISC_REG_COUNT];
--
1.7.9.5
next prev parent reply other threads:[~2015-04-24 16:49 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 ` Rhyland Klein [this message]
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 ` [PATCH 17/19] clk: tegra: pll: Fix _pll_ramp_calc_pll logic Rhyland Klein
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-10-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