Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 23:20:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clk: at91: sam9x60-pll: check fcore against ranges

Browse Source 
According to datasheet the range of 600-1200MHz is for the
frequency generated by the fractional part of the PLL (namely
Fcorepllck according to datasheet). With this in mind the output
range of the PLL itself (fractional + div), taking into account
that the divider is 8 bits wide, is 600/256-1200Hz=2.3-1200MHz.

Fixes: a436c2a447e59 ("clk: at91: add sam9x60 PLL driver")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/1595403506-8209-6-git-send-email-claudiu.beznea@microchip.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Claudiu Beznea 2020-07-22 10:38:13 +03:00 committed by Stephen Boyd
parent 1bef0986b1
commit 390227dca8
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/clk/at91/clk-sam9x60-pll.c
View File

@ -21,6 +21,9 @@
#define UPLL_DIV 2
#define PLL_MUL_MAX (FIELD_GET(PMC_PLL_CTRL1_MUL_MSK, UINT_MAX) + 1)
#define FCORE_MIN (600000000)
#define FCORE_MAX (1200000000)
#define PLL_MAX_ID 1
struct sam9x60_pll {
@ -168,6 +171,7 @@ static long sam9x60_pll_get_best_div_mul(struct sam9x60_pll *pll,
unsigned long bestdiv = 0;
unsigned long bestmul = 0;
unsigned long bestfrac = 0;
u64 fcore = 0;
if (rate < characteristics->output[0].min ||
rate > characteristics->output[0].max)
@ -212,6 +216,11 @@ static long sam9x60_pll_get_best_div_mul(struct sam9x60_pll *pll,
remainder = rate - tmprate;
}
fcore = parent_rate * (tmpmul + 1) +
((u64)parent_rate * tmpfrac >> 22);
if (fcore < FCORE_MIN || fcore > FCORE_MAX)
continue;
/*
* Compare the remainder with the best remainder found until
* now and elect a new best multiplier/divider pair if the
@ -231,7 +240,8 @@ static long sam9x60_pll_get_best_div_mul(struct sam9x60_pll *pll,
}
/* Check if bestrate is a valid output rate */
if (bestrate < characteristics->output[0].min ||
if (fcore < FCORE_MIN || fcore > FCORE_MAX ||
bestrate < characteristics->output[0].min ||
bestrate > characteristics->output[0].max)
return -ERANGE;

2
drivers/clk/at91/sam9x60.c
View File

@ -22,7 +22,7 @@ static const struct clk_master_layout sam9x60_master_layout = {
};
static const struct clk_range plla_outputs[] = {
{ .min = 300000000, .max = 600000000 },
{ .min = 2343750, .max = 1200000000 },
};
static const struct clk_pll_characteristics plla_characteristics = {