| Message ID | 1487776444-4701-7-git-send-email-pdeschrijver@nvidia.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com> On 22.02.2017 17:14, Peter De Schrijver wrote: > Return the actually achieved rate in cfg->output_rate rather than just the > requested rate. This is important to make clk_round_rate return the correct > result. > > Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> > --- > drivers/clk/tegra/clk-tegra210.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c > index fe698d2..58d7f9c 100644 > --- a/drivers/clk/tegra/clk-tegra210.c > +++ b/drivers/clk/tegra/clk-tegra210.c > @@ -1222,6 +1222,7 @@ static int tegra210_pll_fixed_mdiv_cfg(struct clk_hw *hw, > cfg->n = p_rate / cf; > > cfg->sdm_data = 0; > + cfg->output_rate = input_rate; > if (params->sdm_ctrl_reg) { > unsigned long rem = p_rate - cf * cfg->n; > /* If ssc is enabled SDM enabled as well, even for integer n */ > @@ -1232,10 +1233,15 @@ static int tegra210_pll_fixed_mdiv_cfg(struct clk_hw *hw, > s -= PLL_SDM_COEFF / 2; > cfg->sdm_data = sdin_din_to_data(s); > } > + cfg->output_rate *= cfg->n * PLL_SDM_COEFF + PLL_SDM_COEFF/2 + > + sdin_data_to_din(cfg->sdm_data); > + cfg->output_rate /= p * cfg->m * PLL_SDM_COEFF; > + } else { > + cfg->output_rate *= cfg->n; > + cfg->output_rate /= p * cfg->m; > } > > cfg->input_rate = input_rate; > - cfg->output_rate = rate; > > return 0; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c index fe698d2..58d7f9c 100644 --- a/drivers/clk/tegra/clk-tegra210.c +++ b/drivers/clk/tegra/clk-tegra210.c @@ -1222,6 +1222,7 @@ static int tegra210_pll_fixed_mdiv_cfg(struct clk_hw *hw, cfg->n = p_rate / cf; cfg->sdm_data = 0; + cfg->output_rate = input_rate; if (params->sdm_ctrl_reg) { unsigned long rem = p_rate - cf * cfg->n; /* If ssc is enabled SDM enabled as well, even for integer n */ @@ -1232,10 +1233,15 @@ static int tegra210_pll_fixed_mdiv_cfg(struct clk_hw *hw, s -= PLL_SDM_COEFF / 2; cfg->sdm_data = sdin_din_to_data(s); } + cfg->output_rate *= cfg->n * PLL_SDM_COEFF + PLL_SDM_COEFF/2 + + sdin_data_to_din(cfg->sdm_data); + cfg->output_rate /= p * cfg->m * PLL_SDM_COEFF; + } else { + cfg->output_rate *= cfg->n; + cfg->output_rate /= p * cfg->m; } cfg->input_rate = input_rate; - cfg->output_rate = rate; return 0; }
Return the actually achieved rate in cfg->output_rate rather than just the requested rate. This is important to make clk_round_rate return the correct result. Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> --- drivers/clk/tegra/clk-tegra210.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)