LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imx8mm: clock: fix fracpll decode issue 

The fracpll decoding is using the bit definitions for int pll. Most of
them are same, but the CLKE bit is different. Fix the wrong CLKE_MASK
for fracpll and correct all bit definitions in fracpll decoding.

Reviewed-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Ye Li 2020-03-23 19:54:29 -07:00 committed by Stefano Babic
parent 828ad358a5
commit 1c97fcda7f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
View File

@ -19,7 +19,7 @@
#define LOCK_STATUS BIT(31) #define LOCK_STATUS BIT(31)
#define LOCK_SEL_MASK BIT(29) #define LOCK_SEL_MASK BIT(29)
#define CLKE_MASK BIT(11) #define CLKE_MASK BIT(13)
#define RST_MASK BIT(9) #define RST_MASK BIT(9)
#define BYPASS_MASK BIT(4) #define BYPASS_MASK BIT(4)
#define MDIV_SHIFT 12 #define MDIV_SHIFT 12

24
arch/arm/mach-imx/imx8m/clock_imx8mm.c
View File

@ -447,34 +447,34 @@ static u32 decode_fracpll(enum clk_root_src frac_pll)
} }
/* Only support SYS_XTAL 24M, PAD_CLK not take into consideration */ /* Only support SYS_XTAL 24M, PAD_CLK not take into consideration */
if ((pll_gnrl_ctl & INTPLL_REF_CLK_SEL_MASK) != 0) if ((pll_gnrl_ctl & GENMASK(1, 0)) != 0)
return 0; return 0;
if ((pll_gnrl_ctl & INTPLL_RST_MASK) == 0) if ((pll_gnrl_ctl & RST_MASK) == 0)
return 0; return 0;
/* /*
* When BYPASS is equal to 1, PLL enters the bypass mode * When BYPASS is equal to 1, PLL enters the bypass mode
* regardless of the values of RESETB * regardless of the values of RESETB
*/ */
if (pll_gnrl_ctl & INTPLL_BYPASS_MASK) if (pll_gnrl_ctl & BYPASS_MASK)
return 24000000u; return 24000000u;
if (!(pll_gnrl_ctl & INTPLL_LOCK_MASK)) { if (!(pll_gnrl_ctl & LOCK_STATUS)) {
puts("pll not locked\n"); puts("pll not locked\n");
return 0; return 0;
} }
if (!(pll_gnrl_ctl & INTPLL_CLKE_MASK)) if (!(pll_gnrl_ctl & CLKE_MASK))
return 0; return 0;
main_div = (pll_fdiv_ctl0 & INTPLL_MAIN_DIV_MASK) >> main_div = (pll_fdiv_ctl0 & MDIV_MASK) >>
INTPLL_MAIN_DIV_SHIFT; MDIV_SHIFT;
pre_div = (pll_fdiv_ctl0 & INTPLL_PRE_DIV_MASK) >> pre_div = (pll_fdiv_ctl0 & PDIV_MASK) >>
INTPLL_PRE_DIV_SHIFT; PDIV_SHIFT;
post_div = (pll_fdiv_ctl0 & INTPLL_POST_DIV_MASK) >> post_div = (pll_fdiv_ctl0 & SDIV_MASK) >>
INTPLL_POST_DIV_SHIFT; SDIV_SHIFT;
k = pll_fdiv_ctl1 & GENMASK(15, 0); k = pll_fdiv_ctl1 & KDIV_MASK;
return lldiv((main_div * 65536 + k) * 24000000ULL, return lldiv((main_div * 65536 + k) * 24000000ULL,
65536 * pre_div * (1 << post_div)); 65536 * pre_div * (1 << post_div));