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

rockchip: rk3036: update clock driver for ddr

Browse Source 
After the MASK MACRO update, we need to update the driver at the same time.
This is a fix to:
37943aa rockchip: rk3036: clean mask definition for cru reg

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
Kever Yang 2017-11-30 16:51:20 +08:00 committed by Philipp Tomsich
parent faa75ad9e6
commit 731cafecc5
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
View File

@ -330,29 +330,26 @@ static void rkdclk_init(struct rk3036_sdram_priv *priv)
struct rk3036_pll *pll = &priv->cru->pll[1]; struct rk3036_pll *pll = &priv->cru->pll[1];
/* pll enter slow-mode */ /* pll enter slow-mode */
rk_clrsetreg(&priv->cru->cru_mode_con, rk_clrsetreg(&priv->cru->cru_mode_con, DPLL_MODE_MASK,
DPLL_MODE_MASK << DPLL_MODE_SHIFT,
DPLL_MODE_SLOW << DPLL_MODE_SHIFT); DPLL_MODE_SLOW << DPLL_MODE_SHIFT);
/* use integer mode */ /* use integer mode */
rk_clrreg(&pll->con1, 1 << PLL_DSMPD_SHIFT); rk_clrreg(&pll->con1, 1 << PLL_DSMPD_SHIFT);
rk_clrsetreg(&pll->con0, rk_clrsetreg(&pll->con0,
PLL_POSTDIV1_MASK << PLL_POSTDIV1_SHIFT | PLL_FBDIV_MASK, PLL_POSTDIV1_MASK | PLL_FBDIV_MASK,
(dpll_init_cfg.postdiv1 << PLL_POSTDIV1_SHIFT) | (dpll_init_cfg.postdiv1 << PLL_POSTDIV1_SHIFT) |
dpll_init_cfg.fbdiv); dpll_init_cfg.fbdiv);
rk_clrsetreg(&pll->con1, PLL_POSTDIV2_MASK << PLL_POSTDIV2_SHIFT | rk_clrsetreg(&pll->con1, PLL_POSTDIV2_MASK | PLL_REFDIV_MASK,
PLL_REFDIV_MASK << PLL_REFDIV_SHIFT, (dpll_init_cfg.postdiv2 << PLL_POSTDIV2_SHIFT |
(dpll_init_cfg.postdiv2 << PLL_POSTDIV2_SHIFT | dpll_init_cfg.refdiv << PLL_REFDIV_SHIFT));
dpll_init_cfg.refdiv << PLL_REFDIV_SHIFT));
/* waiting for pll lock */ /* waiting for pll lock */
while (readl(&pll->con1) & (1 << PLL_LOCK_STATUS_SHIFT)) while (readl(&pll->con1) & (1 << PLL_LOCK_STATUS_SHIFT))
rockchip_udelay(1); rockchip_udelay(1);
/* PLL enter normal-mode */ /* PLL enter normal-mode */
rk_clrsetreg(&priv->cru->cru_mode_con, rk_clrsetreg(&priv->cru->cru_mode_con, DPLL_MODE_MASK,
DPLL_MODE_MASK << DPLL_MODE_SHIFT,
DPLL_MODE_NORM << DPLL_MODE_SHIFT); DPLL_MODE_NORM << DPLL_MODE_SHIFT);
} }