qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clk: rockchip: rk3036: fix up the assert error 

Change-Id: Id987e8847dbe97e5502259a9432dac85782769f3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
This commit is contained in:
Elaine Zhang 2019-04-18 16:32:38 +08:00 committed by Kever Yang
parent 27b00bb2a4
commit f149c047e6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/clk/rockchip/clk_rk3036.c
View File

@ -121,10 +121,10 @@ static void rkclk_init(struct rk3036_cru *cru)
* core hz : apll = 1:1 * core hz : apll = 1:1
*/ */
aclk_div = APLL_HZ / CORE_ACLK_HZ - 1; aclk_div = APLL_HZ / CORE_ACLK_HZ - 1;
assert((aclk_div + 1) * CORE_ACLK_HZ == APLL_HZ && aclk_div < 0x7); assert((aclk_div + 1) * CORE_ACLK_HZ <= APLL_HZ && aclk_div < 0x7);
pclk_div = APLL_HZ / CORE_PERI_HZ - 1; pclk_div = APLL_HZ / CORE_PERI_HZ - 1;
assert((pclk_div + 1) * CORE_PERI_HZ == APLL_HZ && pclk_div < 0xf); assert((pclk_div + 1) * CORE_PERI_HZ <= APLL_HZ && pclk_div < 0xf);
rk_clrsetreg(&cru->cru_clksel_con[0], rk_clrsetreg(&cru->cru_clksel_con[0],
CORE_CLK_PLL_SEL_MASK | CORE_DIV_CON_MASK, CORE_CLK_PLL_SEL_MASK | CORE_DIV_CON_MASK,
@ -141,13 +141,13 @@ static void rkclk_init(struct rk3036_cru *cru)
* set up dependent divisors for PCLK/HCLK and ACLK clocks. * set up dependent divisors for PCLK/HCLK and ACLK clocks.
*/ */
aclk_div = GPLL_HZ / BUS_ACLK_HZ - 1; aclk_div = GPLL_HZ / BUS_ACLK_HZ - 1;
assert((aclk_div + 1) * BUS_ACLK_HZ == GPLL_HZ && aclk_div <= 0x1f); assert((aclk_div + 1) * BUS_ACLK_HZ <= GPLL_HZ && aclk_div <= 0x1f);
pclk_div = BUS_ACLK_HZ / BUS_PCLK_HZ - 1; pclk_div = BUS_ACLK_HZ / BUS_PCLK_HZ - 1;
assert((pclk_div + 1) * BUS_PCLK_HZ == BUS_ACLK_HZ && pclk_div <= 0x7); assert((pclk_div + 1) * BUS_PCLK_HZ <= BUS_ACLK_HZ && pclk_div <= 0x7);
hclk_div = BUS_ACLK_HZ / BUS_HCLK_HZ - 1; hclk_div = BUS_ACLK_HZ / BUS_HCLK_HZ - 1;
assert((hclk_div + 1) * BUS_HCLK_HZ == BUS_ACLK_HZ && hclk_div <= 0x3); assert((hclk_div + 1) * BUS_HCLK_HZ <= BUS_ACLK_HZ && hclk_div <= 0x3);
rk_clrsetreg(&cru->cru_clksel_con[0], rk_clrsetreg(&cru->cru_clksel_con[0],
BUS_ACLK_PLL_SEL_MASK | BUS_ACLK_DIV_MASK, BUS_ACLK_PLL_SEL_MASK | BUS_ACLK_DIV_MASK,
@ -164,14 +164,14 @@ static void rkclk_init(struct rk3036_cru *cru)
* set up dependent divisors for PCLK/HCLK and ACLK clocks. * set up dependent divisors for PCLK/HCLK and ACLK clocks.
*/ */
aclk_div = GPLL_HZ / PERI_ACLK_HZ - 1; aclk_div = GPLL_HZ / PERI_ACLK_HZ - 1;
assert((aclk_div + 1) * PERI_ACLK_HZ == GPLL_HZ && aclk_div < 0x1f); assert((aclk_div + 1) * PERI_ACLK_HZ <= GPLL_HZ && aclk_div < 0x1f);
hclk_div = ilog2(PERI_ACLK_HZ / PERI_HCLK_HZ); hclk_div = ilog2(PERI_ACLK_HZ / PERI_HCLK_HZ);
assert((1 << hclk_div) * PERI_HCLK_HZ == assert((1 << hclk_div) * PERI_HCLK_HZ <=
PERI_ACLK_HZ && (hclk_div < 0x4)); PERI_ACLK_HZ && (hclk_div < 0x4));
pclk_div = ilog2(PERI_ACLK_HZ / PERI_PCLK_HZ); pclk_div = ilog2(PERI_ACLK_HZ / PERI_PCLK_HZ);
assert((1 << pclk_div) * PERI_PCLK_HZ == assert((1 << pclk_div) * PERI_PCLK_HZ <=
PERI_ACLK_HZ && pclk_div < 0x8); PERI_ACLK_HZ && pclk_div < 0x8);
rk_clrsetreg(&cru->cru_clksel_con[10], rk_clrsetreg(&cru->cru_clksel_con[10],