Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751485AbbD3KLw (ORCPT ); Thu, 30 Apr 2015 06:11:52 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:14781 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751187AbbD3KLt (ORCPT ); Thu, 30 Apr 2015 06:11:49 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Thu, 30 Apr 2015 03:10:14 -0700 Date: Thu, 30 Apr 2015 13:11:42 +0300 From: Peter De Schrijver To: Rhyland Klein CC: Mike Turquette , Stephen Warren , Stephen Boyd , Thierry Reding , Alexandre Courbot , , , Subject: Re: [PATCH v2 13/19] clk: tegra: pll: Add support for PLLMB for T210 Message-ID: <20150430101142.GT3097@tbergstrom-lnx.Nvidia.com> References: <1430328109-537-1-git-send-email-rklein@nvidia.com> <1430328109-537-14-git-send-email-rklein@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1430328109-537-14-git-send-email-rklein@nvidia.com> X-NVConfidentiality: public User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: [10.21.24.170] X-ClientProxiedBy: UKMAIL101.nvidia.com (10.26.138.13) To UKMAIL101.nvidia.com (10.26.138.13) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5214 Lines: 143 On Wed, Apr 29, 2015 at 01:21:43PM -0400, Rhyland Klein wrote: > Tegra210 SoC's have 2 PLLS for memory usage. Add plumbing to register > and handle PLLMB. > Seems my comments to v1 never made it to the list :/ trying again: I think this would be better rephrased as: 'Tegra210 SoC's have 2 PLLs for memory usage. Add plumbing to register and handle PLLMB.' The whole point of PLLMB is exactly that it allows switching between 2 PLLMs without having to use an intermediate backup PLL, because the PLL has to have locked before we can switch to it. > Signed-off-by: Rhyland Klein > --- > v2: > - Fixed commit description as suggested. > > drivers/clk/tegra/clk-pll.c | 46 +++++++++++++++++++++++++++++++++++++++---- > drivers/clk/tegra/clk.h | 9 +++++++++ > 2 files changed, 51 insertions(+), 4 deletions(-) > > diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c > index c938bdc9415f..edc388f02a66 100644 > --- a/drivers/clk/tegra/clk-pll.c > +++ b/drivers/clk/tegra/clk-pll.c > @@ -547,7 +547,7 @@ static void _update_pll_mnp(struct tegra_clk_pll *pll, > struct tegra_clk_pll_params *params = pll->params; > struct div_nmp *div_nmp = params->div_nmp; > > - if ((params->flags & TEGRA_PLLM) && > + if ((params->flags & (TEGRA_PLLM | TEGRA_PLLMB)) && > (pll_override_readl(PMC_PLLP_WB0_OVERRIDE, pll) & > PMC_PLLP_WB0_OVERRIDE_PLLM_OVERRIDE)) { > val = pll_override_readl(params->pmc_divp_reg, pll); > @@ -584,7 +584,7 @@ static void _get_pll_mnp(struct tegra_clk_pll *pll, > struct tegra_clk_pll_params *params = pll->params; > struct div_nmp *div_nmp = params->div_nmp; > > - if ((params->flags & TEGRA_PLLM) && > + if ((params->flags & (TEGRA_PLLM | TEGRA_PLLMB)) && > (pll_override_readl(PMC_PLLP_WB0_OVERRIDE, pll) & > PMC_PLLP_WB0_OVERRIDE_PLLM_OVERRIDE)) { > val = pll_override_readl(params->pmc_divp_reg, pll); > @@ -730,8 +730,8 @@ static long clk_pll_round_rate(struct clk_hw *hw, unsigned long rate, > if (pll->params->flags & TEGRA_PLL_FIXED) > return pll->params->fixed_rate; > > - /* PLLM is used for memory; we do not change rate */ > - if (pll->params->flags & TEGRA_PLLM) > + /* PLLM/MB are used for memory; we do not change rate */ > + if (pll->params->flags & (TEGRA_PLLM | TEGRA_PLLMB)) > return __clk_get_rate(hw->clk); > > if (_get_table_rate(hw, &cfg, rate, *prate) && > @@ -2310,4 +2310,42 @@ struct clk *tegra_clk_register_pllss_tegra210(const char *name, > > return clk; > } > + > +struct clk *tegra_clk_register_pllmb(const char *name, const char *parent_name, > + void __iomem *clk_base, void __iomem *pmc, > + unsigned long flags, > + struct tegra_clk_pll_params *pll_params, > + spinlock_t *lock) > +{ > + struct tegra_clk_pll *pll; > + struct clk *clk, *parent; > + unsigned long parent_rate; > + > + if (!pll_params->pdiv_tohw) > + return ERR_PTR(-EINVAL); > + > + parent = __clk_lookup(parent_name); > + if (!parent) { > + WARN(1, "parent clk %s of %s must be registered first\n", > + name, parent_name); > + return ERR_PTR(-EINVAL); > + } > + > + parent_rate = __clk_get_rate(parent); > + > + pll_params->vco_min = _clip_vco_min(pll_params->vco_min, parent_rate); > + > + pll_params->flags |= TEGRA_PLL_BYPASS; > + pll_params->flags |= TEGRA_PLLMB; > + pll = _tegra_init_pll(clk_base, pmc, pll_params, lock); > + if (IS_ERR(pll)) > + return ERR_CAST(pll); > + > + clk = _tegra_clk_register_pll(pll, name, parent_name, flags, > + &tegra_clk_pllm_ops); > + if (IS_ERR(clk)) > + kfree(pll); > + > + return clk; > +} > #endif > diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h > index 26e31580dc9e..9e37defb063f 100644 > --- a/drivers/clk/tegra/clk.h > +++ b/drivers/clk/tegra/clk.h > @@ -201,6 +201,8 @@ struct div_nmp { > * TEGRA_PLL_HAS_LOCK_ENABLE - PLL has bit to enable lock monitoring > * TEGRA_MDIV_NEW - Switch to new method for calculating fixed mdiv > * it may be more accurate (especially if SDM present) > + * TEGRA_PLLMB - PLLMB has should be treated similar to PLLM. This > + * flag indicated that it is PLLMB. > */ > struct tegra_clk_pll_params { > unsigned long input_min; > @@ -260,6 +262,7 @@ struct tegra_clk_pll_params { > #define TEGRA_PLL_BYPASS BIT(9) > #define TEGRA_PLL_HAS_LOCK_ENABLE BIT(10) > #define TEGRA_MDIV_NEW BIT(11) > +#define TEGRA_PLLMB BIT(12) > > /** > * struct tegra_clk_pll - Tegra PLL clock > @@ -366,6 +369,12 @@ struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name, > struct tegra_clk_pll_params *pll_params, > spinlock_t *lock); > > +struct clk *tegra_clk_register_pllmb(const char *name, const char *parent_name, > + void __iomem *clk_base, void __iomem *pmc, > + unsigned long flags, > + struct tegra_clk_pll_params *pll_params, > + spinlock_t *lock); > + > /** > * struct tegra_clk_pll_out - PLL divider down clock > * > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/