| Message ID | 1370441329-8619-3-git-send-email-pdeschrijver@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/05/2013 08:08 AM, Peter De Schrijver wrote: Commit description? > diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c > +#ifdef CONFIG_PM_SLEEP > +static struct cpu_clk_suspend_context { > + u32 clk_csite_src; > +} tegra114_cpu_clk_sctx; > +#endif That generates: drivers/clk/tegra/clk-tegra114.c:263:3: warning: ‘tegra114_cpu_clk_sctx’ defined but not used [-Wunused-variable]
On Wed, Jun 05, 2013 at 05:57:02PM +0200, Stephen Warren wrote: > On 06/05/2013 08:08 AM, Peter De Schrijver wrote: > > Commit description? > > > diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c > > > +#ifdef CONFIG_PM_SLEEP > > +static struct cpu_clk_suspend_context { > > + u32 clk_csite_src; > > +} tegra114_cpu_clk_sctx; > > +#endif > > That generates: > > drivers/clk/tegra/clk-tegra114.c:263:3: warning: ‘tegra114_cpu_clk_sctx’ > defined but not used [-Wunused-variable] Ah. This should not be part of this patch indeed... Cheers, Peter.
diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c index d29ad1d..2774379e 100644 --- a/drivers/clk/tegra/clk-tegra114.c +++ b/drivers/clk/tegra/clk-tegra114.c @@ -254,6 +254,16 @@ /* Tegra CPU clock and reset control regs */ #define CLK_RST_CONTROLLER_CPU_CMPLX_STATUS 0x470 +/* PLLM override registers */ +#define PMC_PLLM_WB0_OVERRIDE 0x1dc +#define PMC_PLLM_WB0_OVERRIDE_2 0x2b0 + +#ifdef CONFIG_PM_SLEEP +static struct cpu_clk_suspend_context { + u32 clk_csite_src; +} tegra114_cpu_clk_sctx; +#endif + static int periph_clk_enb_refcnt[CLK_OUT_ENB_NUM * 32]; static void __iomem *clk_base; @@ -398,10 +408,13 @@ static struct tegra_clk_pll_params pll_c3_params = { static struct div_nmp pllm_nmp = { .divm_shift = 0, .divm_width = 8, + .override_divm_shift = 0, .divn_shift = 8, .divn_width = 8, + .override_divn_shift = 8, .divp_shift = 20, .divp_width = 1, + .override_divp_shift = 27, }; static struct pdiv_map pllm_p[] = { @@ -434,6 +447,8 @@ static struct tegra_clk_pll_params pll_m_params = { .max_p = 2, .pdiv_tohw = pllm_p, .div_nmp = &pllm_nmp, + .pmc_divnm_reg = PMC_PLLM_WB0_OVERRIDE, + .pmc_divp_reg = PMC_PLLM_WB0_OVERRIDE_2, }; static struct div_nmp pllp_nmp = {
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> --- drivers/clk/tegra/clk-tegra114.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)