Skip to content

Commit ee95a52

Browse files
committed
clk: at91: sam9x60-pll: use frac when setting frequency
In commit a436c2a ("clk: at91: add sam9x60 PLL driver") the fractional part of PLL wasn't set on registers but it was calculated and taken into account for determining div and mul (see sam9x60_pll_get_best_div_mul()). Fixes: a436c2a ("clk: at91: add sam9x60 PLL driver") Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> Link: https://lore.kernel.org/r/1595403506-8209-7-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent a1bb281 commit ee95a52

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

drivers/clk/at91/clk-sam9x60-pll.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#define PMC_PLL_ISR0 0xec
3838
#define PMC_PLL_CTRL0_DIV_MSK GENMASK(7, 0)
3939
#define PMC_PLL_CTRL1_MUL_MSK GENMASK(31, 24)
40+
#define PMC_PLL_CTRL1_FRACR_MSK GENMASK(21, 0)
4041

4142
#define PLL_DIV_MAX (FIELD_GET(PMC_PLL_CTRL0_DIV_MSK, UINT_MAX) + 1)
4243
#define UPLL_DIV 2
@@ -76,7 +77,7 @@ static int sam9x60_pll_prepare(struct clk_hw *hw)
7677
unsigned long flags;
7778
u8 div;
7879
u16 mul;
79-
u32 val;
80+
u32 val, frac;
8081

8182
spin_lock_irqsave(pll->lock, flags);
8283
regmap_write(regmap, PMC_PLL_UPDT, pll->id);
@@ -86,9 +87,10 @@ static int sam9x60_pll_prepare(struct clk_hw *hw)
8687

8788
regmap_read(regmap, PMC_PLL_CTRL1, &val);
8889
mul = FIELD_GET(PMC_PLL_CTRL1_MUL_MSK, val);
90+
frac = FIELD_GET(PMC_PLL_CTRL1_FRACR_MSK, val);
8991

9092
if (sam9x60_pll_ready(regmap, pll->id) &&
91-
(div == pll->div && mul == pll->mul)) {
93+
(div == pll->div && mul == pll->mul && frac == pll->frac)) {
9294
spin_unlock_irqrestore(pll->lock, flags);
9395
return 0;
9496
}
@@ -100,8 +102,9 @@ static int sam9x60_pll_prepare(struct clk_hw *hw)
100102
val = PMC_PLL_ACR_DEFAULT_PLLA;
101103
regmap_write(regmap, PMC_PLL_ACR, val);
102104

103-
regmap_write(regmap, PMC_PLL_CTRL1,
104-
FIELD_PREP(PMC_PLL_CTRL1_MUL_MSK, pll->mul));
105+
regmap_write(regmap, AT91_PMC_PLL_CTRL1,
106+
FIELD_PREP(PMC_PLL_CTRL1_MUL_MSK, pll->mul) |
107+
FIELD_PREP(PMC_PLL_CTRL1_FRACR_MSK, pll->frac));
105108

106109
if (pll->characteristics->upll) {
107110
/* Enable the UTMI internal bandgap */
@@ -174,7 +177,8 @@ static unsigned long sam9x60_pll_recalc_rate(struct clk_hw *hw,
174177
{
175178
struct sam9x60_pll *pll = to_sam9x60_pll(hw);
176179

177-
return (parent_rate * (pll->mul + 1)) / (pll->div + 1);
180+
return DIV_ROUND_CLOSEST_ULL((parent_rate * (pll->mul + 1) +
181+
((u64)parent_rate * pll->frac >> 22)), (pll->div + 1));
178182
}
179183

180184
static long sam9x60_pll_get_best_div_mul(struct sam9x60_pll *pll,

0 commit comments

Comments
 (0)