rockchip: rk3036: clean mask definition for cru reg
Embeded the shift in mask MACRO definition in cru header file and clock driver. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
9d7ed33926
commit
37943aaeea
@ -68,102 +68,102 @@ struct pll_div {
|
|||||||
|
|
||||||
enum {
|
enum {
|
||||||
/* PLLCON0*/
|
/* PLLCON0*/
|
||||||
PLL_POSTDIV1_MASK = 7,
|
|
||||||
PLL_POSTDIV1_SHIFT = 12,
|
PLL_POSTDIV1_SHIFT = 12,
|
||||||
PLL_FBDIV_MASK = 0xfff,
|
PLL_POSTDIV1_MASK = 7 << PLL_POSTDIV1_SHIFT,
|
||||||
PLL_FBDIV_SHIFT = 0,
|
PLL_FBDIV_SHIFT = 0,
|
||||||
|
PLL_FBDIV_MASK = 0xfff,
|
||||||
|
|
||||||
/* PLLCON1 */
|
/* PLLCON1 */
|
||||||
PLL_DSMPD_MASK = 1,
|
|
||||||
PLL_DSMPD_SHIFT = 12,
|
|
||||||
PLL_LOCK_STATUS_MASK = 1,
|
|
||||||
PLL_LOCK_STATUS_SHIFT = 10,
|
|
||||||
PLL_POSTDIV2_MASK = 7,
|
|
||||||
PLL_POSTDIV2_SHIFT = 6,
|
|
||||||
PLL_REFDIV_MASK = 0x3f,
|
|
||||||
PLL_REFDIV_SHIFT = 0,
|
|
||||||
PLL_RST_SHIFT = 14,
|
PLL_RST_SHIFT = 14,
|
||||||
|
PLL_DSMPD_SHIFT = 12,
|
||||||
|
PLL_DSMPD_MASK = 1 << PLL_DSMPD_SHIFT,
|
||||||
|
PLL_LOCK_STATUS_SHIFT = 10,
|
||||||
|
PLL_LOCK_STATUS_MASK = 1 << PLL_LOCK_STATUS_SHIFT,
|
||||||
|
PLL_POSTDIV2_SHIFT = 6,
|
||||||
|
PLL_POSTDIV2_MASK = 7 << PLL_POSTDIV2_SHIFT,
|
||||||
|
PLL_REFDIV_SHIFT = 0,
|
||||||
|
PLL_REFDIV_MASK = 0x3f,
|
||||||
|
|
||||||
/* CRU_MODE */
|
/* CRU_MODE */
|
||||||
GPLL_MODE_MASK = 3,
|
|
||||||
GPLL_MODE_SHIFT = 12,
|
GPLL_MODE_SHIFT = 12,
|
||||||
|
GPLL_MODE_MASK = 3 << GPLL_MODE_SHIFT,
|
||||||
GPLL_MODE_SLOW = 0,
|
GPLL_MODE_SLOW = 0,
|
||||||
GPLL_MODE_NORM,
|
GPLL_MODE_NORM,
|
||||||
GPLL_MODE_DEEP,
|
GPLL_MODE_DEEP,
|
||||||
DPLL_MODE_MASK = 1,
|
|
||||||
DPLL_MODE_SHIFT = 4,
|
DPLL_MODE_SHIFT = 4,
|
||||||
|
DPLL_MODE_MASK = 1 << DPLL_MODE_SHIFT,
|
||||||
DPLL_MODE_SLOW = 0,
|
DPLL_MODE_SLOW = 0,
|
||||||
DPLL_MODE_NORM,
|
DPLL_MODE_NORM,
|
||||||
APLL_MODE_MASK = 1,
|
|
||||||
APLL_MODE_SHIFT = 0,
|
APLL_MODE_SHIFT = 0,
|
||||||
|
APLL_MODE_MASK = 1 << APLL_MODE_SHIFT,
|
||||||
APLL_MODE_SLOW = 0,
|
APLL_MODE_SLOW = 0,
|
||||||
APLL_MODE_NORM,
|
APLL_MODE_NORM,
|
||||||
|
|
||||||
/* CRU_CLK_SEL0_CON */
|
/* CRU_CLK_SEL0_CON */
|
||||||
CPU_CLK_PLL_SEL_MASK = 3,
|
BUS_ACLK_PLL_SEL_SHIFT = 14,
|
||||||
CPU_CLK_PLL_SEL_SHIFT = 14,
|
BUS_ACLK_PLL_SEL_MASK = 3 << BUS_ACLK_PLL_SEL_SHIFT,
|
||||||
CPU_CLK_PLL_SEL_APLL = 0,
|
BUS_ACLK_PLL_SEL_APLL = 0,
|
||||||
CPU_CLK_PLL_SEL_DPLL,
|
BUS_ACLK_PLL_SEL_DPLL,
|
||||||
CPU_CLK_PLL_SEL_GPLL,
|
BUS_ACLK_PLL_SEL_GPLL,
|
||||||
ACLK_CPU_DIV_MASK = 0x1f,
|
BUS_ACLK_DIV_SHIFT = 8,
|
||||||
ACLK_CPU_DIV_SHIFT = 8,
|
BUS_ACLK_DIV_MASK = 0x1f << BUS_ACLK_DIV_SHIFT,
|
||||||
CORE_CLK_PLL_SEL_MASK = 1,
|
|
||||||
CORE_CLK_PLL_SEL_SHIFT = 7,
|
CORE_CLK_PLL_SEL_SHIFT = 7,
|
||||||
|
CORE_CLK_PLL_SEL_MASK = 1 << CORE_CLK_PLL_SEL_SHIFT,
|
||||||
CORE_CLK_PLL_SEL_APLL = 0,
|
CORE_CLK_PLL_SEL_APLL = 0,
|
||||||
CORE_CLK_PLL_SEL_GPLL,
|
CORE_CLK_PLL_SEL_GPLL,
|
||||||
CORE_DIV_CON_MASK = 0x1f,
|
|
||||||
CORE_DIV_CON_SHIFT = 0,
|
CORE_DIV_CON_SHIFT = 0,
|
||||||
|
CORE_DIV_CON_MASK = 0x1f << CORE_DIV_CON_SHIFT,
|
||||||
|
|
||||||
/* CRU_CLK_SEL1_CON */
|
/* CRU_CLK_SEL1_CON */
|
||||||
CPU_PCLK_DIV_MASK = 7,
|
BUS_PCLK_DIV_SHIFT = 12,
|
||||||
CPU_PCLK_DIV_SHIFT = 12,
|
BUS_PCLK_DIV_MASK = 7 << BUS_PCLK_DIV_SHIFT,
|
||||||
CPU_HCLK_DIV_MASK = 3,
|
BUS_HCLK_DIV_SHIFT = 8,
|
||||||
CPU_HCLK_DIV_SHIFT = 8,
|
BUS_HCLK_DIV_MASK = 3 << BUS_HCLK_DIV_SHIFT,
|
||||||
CORE_ACLK_DIV_MASK = 7,
|
|
||||||
CORE_ACLK_DIV_SHIFT = 4,
|
CORE_ACLK_DIV_SHIFT = 4,
|
||||||
CORE_PERI_DIV_MASK = 0xf,
|
CORE_ACLK_DIV_MASK = 7 << CORE_ACLK_DIV_SHIFT,
|
||||||
CORE_PERI_DIV_SHIFT = 0,
|
CORE_PERI_DIV_SHIFT = 0,
|
||||||
|
CORE_PERI_DIV_MASK = 0xf << CORE_PERI_DIV_SHIFT,
|
||||||
|
|
||||||
/* CRU_CLKSEL10_CON */
|
/* CRU_CLKSEL10_CON */
|
||||||
PERI_PLL_SEL_MASK = 3,
|
|
||||||
PERI_PLL_SEL_SHIFT = 14,
|
PERI_PLL_SEL_SHIFT = 14,
|
||||||
|
PERI_PLL_SEL_MASK = 3 << PERI_PLL_SEL_SHIFT,
|
||||||
PERI_PLL_APLL = 0,
|
PERI_PLL_APLL = 0,
|
||||||
PERI_PLL_DPLL,
|
PERI_PLL_DPLL,
|
||||||
PERI_PLL_GPLL,
|
PERI_PLL_GPLL,
|
||||||
PERI_PCLK_DIV_MASK = 3,
|
|
||||||
PERI_PCLK_DIV_SHIFT = 12,
|
PERI_PCLK_DIV_SHIFT = 12,
|
||||||
PERI_HCLK_DIV_MASK = 3,
|
PERI_PCLK_DIV_MASK = 3 << PERI_PCLK_DIV_SHIFT,
|
||||||
PERI_HCLK_DIV_SHIFT = 8,
|
PERI_HCLK_DIV_SHIFT = 8,
|
||||||
PERI_ACLK_DIV_MASK = 0x1f,
|
PERI_HCLK_DIV_MASK = 3 << PERI_HCLK_DIV_SHIFT,
|
||||||
PERI_ACLK_DIV_SHIFT = 0,
|
PERI_ACLK_DIV_SHIFT = 0,
|
||||||
|
PERI_ACLK_DIV_MASK = 0x1f << PERI_ACLK_DIV_SHIFT,
|
||||||
|
|
||||||
/* CRU_CLKSEL11_CON */
|
/* CRU_CLKSEL11_CON */
|
||||||
SDIO_DIV_MASK = 0x7f,
|
|
||||||
SDIO_DIV_SHIFT = 8,
|
SDIO_DIV_SHIFT = 8,
|
||||||
MMC0_DIV_MASK = 0x7f,
|
SDIO_DIV_MASK = 0x7f << SDIO_DIV_SHIFT,
|
||||||
MMC0_DIV_SHIFT = 0,
|
MMC0_DIV_SHIFT = 0,
|
||||||
|
MMC0_DIV_MASK = 0x7f << MMC0_DIV_SHIFT,
|
||||||
|
|
||||||
/* CRU_CLKSEL12_CON */
|
/* CRU_CLKSEL12_CON */
|
||||||
EMMC_PLL_MASK = 3,
|
|
||||||
EMMC_PLL_SHIFT = 12,
|
EMMC_PLL_SHIFT = 12,
|
||||||
|
EMMC_PLL_MASK = 3 << EMMC_PLL_SHIFT,
|
||||||
EMMC_SEL_APLL = 0,
|
EMMC_SEL_APLL = 0,
|
||||||
EMMC_SEL_DPLL,
|
EMMC_SEL_DPLL,
|
||||||
EMMC_SEL_GPLL,
|
EMMC_SEL_GPLL,
|
||||||
EMMC_SEL_24M,
|
EMMC_SEL_24M,
|
||||||
SDIO_PLL_MASK = 3,
|
|
||||||
SDIO_PLL_SHIFT = 10,
|
SDIO_PLL_SHIFT = 10,
|
||||||
|
SDIO_PLL_MASK = 3 << SDIO_PLL_SHIFT,
|
||||||
SDIO_SEL_APLL = 0,
|
SDIO_SEL_APLL = 0,
|
||||||
SDIO_SEL_DPLL,
|
SDIO_SEL_DPLL,
|
||||||
SDIO_SEL_GPLL,
|
SDIO_SEL_GPLL,
|
||||||
SDIO_SEL_24M,
|
SDIO_SEL_24M,
|
||||||
MMC0_PLL_MASK = 3,
|
|
||||||
MMC0_PLL_SHIFT = 8,
|
MMC0_PLL_SHIFT = 8,
|
||||||
|
MMC0_PLL_MASK = 3 << MMC0_PLL_SHIFT,
|
||||||
MMC0_SEL_APLL = 0,
|
MMC0_SEL_APLL = 0,
|
||||||
MMC0_SEL_DPLL,
|
MMC0_SEL_DPLL,
|
||||||
MMC0_SEL_GPLL,
|
MMC0_SEL_GPLL,
|
||||||
MMC0_SEL_24M,
|
MMC0_SEL_24M,
|
||||||
EMMC_DIV_MASK = 0x7f,
|
|
||||||
EMMC_DIV_SHIFT = 0,
|
EMMC_DIV_SHIFT = 0,
|
||||||
|
EMMC_DIV_MASK = 0x7f << EMMC_DIV_SHIFT,
|
||||||
|
|
||||||
/* CRU_SOFTRST5_CON */
|
/* CRU_SOFTRST5_CON */
|
||||||
DDRCTRL_PSRST_SHIFT = 11,
|
DDRCTRL_PSRST_SHIFT = 11,
|
||||||
|
@ -65,12 +65,11 @@ static int rkclk_set_pll(struct rk3036_cru *cru, enum rk_clk_id clk_id,
|
|||||||
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,
|
||||||
(div->postdiv1 << PLL_POSTDIV1_SHIFT) | div->fbdiv);
|
(div->postdiv1 << PLL_POSTDIV1_SHIFT) | div->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,
|
(div->postdiv2 << PLL_POSTDIV2_SHIFT |
|
||||||
(div->postdiv2 << PLL_POSTDIV2_SHIFT |
|
div->refdiv << PLL_REFDIV_SHIFT));
|
||||||
div->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))
|
||||||
@ -87,8 +86,7 @@ static void rkclk_init(struct rk3036_cru *cru)
|
|||||||
|
|
||||||
/* pll enter slow-mode */
|
/* pll enter slow-mode */
|
||||||
rk_clrsetreg(&cru->cru_mode_con,
|
rk_clrsetreg(&cru->cru_mode_con,
|
||||||
GPLL_MODE_MASK << GPLL_MODE_SHIFT |
|
GPLL_MODE_MASK | APLL_MODE_MASK,
|
||||||
APLL_MODE_MASK << APLL_MODE_SHIFT,
|
|
||||||
GPLL_MODE_SLOW << GPLL_MODE_SHIFT |
|
GPLL_MODE_SLOW << GPLL_MODE_SHIFT |
|
||||||
APLL_MODE_SLOW << APLL_MODE_SHIFT);
|
APLL_MODE_SLOW << APLL_MODE_SHIFT);
|
||||||
|
|
||||||
@ -97,8 +95,8 @@ static void rkclk_init(struct rk3036_cru *cru)
|
|||||||
rkclk_set_pll(cru, CLK_GENERAL, &gpll_init_cfg);
|
rkclk_set_pll(cru, CLK_GENERAL, &gpll_init_cfg);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* select apll as core clock pll source and
|
* select apll as cpu/core clock pll source and
|
||||||
* set up dependent divisors for PCLK/HCLK and ACLK clocks.
|
* set up dependent divisors for PERI and ACLK clocks.
|
||||||
* 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;
|
||||||
@ -108,19 +106,17 @@ static void rkclk_init(struct rk3036_cru *cru)
|
|||||||
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_CLK_PLL_SEL_SHIFT |
|
CORE_CLK_PLL_SEL_MASK | CORE_DIV_CON_MASK,
|
||||||
CORE_DIV_CON_MASK << CORE_DIV_CON_SHIFT,
|
|
||||||
CORE_CLK_PLL_SEL_APLL << CORE_CLK_PLL_SEL_SHIFT |
|
CORE_CLK_PLL_SEL_APLL << CORE_CLK_PLL_SEL_SHIFT |
|
||||||
0 << CORE_DIV_CON_SHIFT);
|
0 << CORE_DIV_CON_SHIFT);
|
||||||
|
|
||||||
rk_clrsetreg(&cru->cru_clksel_con[1],
|
rk_clrsetreg(&cru->cru_clksel_con[1],
|
||||||
CORE_ACLK_DIV_MASK << CORE_ACLK_DIV_SHIFT |
|
CORE_ACLK_DIV_MASK | CORE_PERI_DIV_MASK,
|
||||||
CORE_PERI_DIV_MASK << CORE_PERI_DIV_SHIFT,
|
|
||||||
aclk_div << CORE_ACLK_DIV_SHIFT |
|
aclk_div << CORE_ACLK_DIV_SHIFT |
|
||||||
pclk_div << CORE_PERI_DIV_SHIFT);
|
pclk_div << CORE_PERI_DIV_SHIFT);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* select apll as cpu clock pll source and
|
* select apll as pd_bus clock pll source and
|
||||||
* set up dependent divisors for PCLK/HCLK and ACLK clocks.
|
* set up dependent divisors for PCLK/HCLK and ACLK clocks.
|
||||||
*/
|
*/
|
||||||
aclk_div = APLL_HZ / CPU_ACLK_HZ - 1;
|
aclk_div = APLL_HZ / CPU_ACLK_HZ - 1;
|
||||||
@ -133,19 +129,17 @@ static void rkclk_init(struct rk3036_cru *cru)
|
|||||||
assert((hclk_div + 1) * CPU_HCLK_HZ == APLL_HZ && hclk_div < 0x3);
|
assert((hclk_div + 1) * CPU_HCLK_HZ == APLL_HZ && hclk_div < 0x3);
|
||||||
|
|
||||||
rk_clrsetreg(&cru->cru_clksel_con[0],
|
rk_clrsetreg(&cru->cru_clksel_con[0],
|
||||||
CPU_CLK_PLL_SEL_MASK << CPU_CLK_PLL_SEL_SHIFT |
|
BUS_ACLK_PLL_SEL_MASK | BUS_ACLK_DIV_MASK,
|
||||||
ACLK_CPU_DIV_MASK << ACLK_CPU_DIV_SHIFT,
|
BUS_ACLK_PLL_SEL_APLL << BUS_ACLK_PLL_SEL_SHIFT |
|
||||||
CPU_CLK_PLL_SEL_APLL << CPU_CLK_PLL_SEL_SHIFT |
|
aclk_div << BUS_ACLK_DIV_SHIFT);
|
||||||
aclk_div << ACLK_CPU_DIV_SHIFT);
|
|
||||||
|
|
||||||
rk_clrsetreg(&cru->cru_clksel_con[1],
|
rk_clrsetreg(&cru->cru_clksel_con[1],
|
||||||
CPU_PCLK_DIV_MASK << CPU_PCLK_DIV_SHIFT |
|
BUS_PCLK_DIV_MASK | BUS_HCLK_DIV_MASK,
|
||||||
CPU_HCLK_DIV_MASK << CPU_HCLK_DIV_SHIFT,
|
pclk_div << BUS_PCLK_DIV_SHIFT |
|
||||||
pclk_div << CPU_PCLK_DIV_SHIFT |
|
hclk_div << BUS_HCLK_DIV_SHIFT);
|
||||||
hclk_div << CPU_HCLK_DIV_SHIFT);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* select gpll as peri clock pll source and
|
* select gpll as pd_peri bus clock source and
|
||||||
* 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;
|
||||||
@ -160,10 +154,8 @@ static void rkclk_init(struct rk3036_cru *cru)
|
|||||||
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],
|
||||||
PERI_PLL_SEL_MASK << PERI_PLL_SEL_SHIFT |
|
PERI_PLL_SEL_MASK | PERI_PCLK_DIV_MASK |
|
||||||
PERI_PCLK_DIV_MASK << PERI_PCLK_DIV_SHIFT |
|
PERI_HCLK_DIV_MASK | PERI_ACLK_DIV_MASK,
|
||||||
PERI_HCLK_DIV_MASK << PERI_HCLK_DIV_SHIFT |
|
|
||||||
PERI_ACLK_DIV_MASK << PERI_ACLK_DIV_SHIFT,
|
|
||||||
PERI_PLL_GPLL << PERI_PLL_SEL_SHIFT |
|
PERI_PLL_GPLL << PERI_PLL_SEL_SHIFT |
|
||||||
pclk_div << PERI_PCLK_DIV_SHIFT |
|
pclk_div << PERI_PCLK_DIV_SHIFT |
|
||||||
hclk_div << PERI_HCLK_DIV_SHIFT |
|
hclk_div << PERI_HCLK_DIV_SHIFT |
|
||||||
@ -171,8 +163,7 @@ static void rkclk_init(struct rk3036_cru *cru)
|
|||||||
|
|
||||||
/* PLL enter normal-mode */
|
/* PLL enter normal-mode */
|
||||||
rk_clrsetreg(&cru->cru_mode_con,
|
rk_clrsetreg(&cru->cru_mode_con,
|
||||||
GPLL_MODE_MASK << GPLL_MODE_SHIFT |
|
GPLL_MODE_MASK | APLL_MODE_MASK,
|
||||||
APLL_MODE_MASK << APLL_MODE_SHIFT,
|
|
||||||
GPLL_MODE_NORM << GPLL_MODE_SHIFT |
|
GPLL_MODE_NORM << GPLL_MODE_SHIFT |
|
||||||
APLL_MODE_NORM << APLL_MODE_SHIFT);
|
APLL_MODE_NORM << APLL_MODE_SHIFT);
|
||||||
}
|
}
|
||||||
@ -189,9 +180,9 @@ static uint32_t rkclk_pll_get_rate(struct rk3036_cru *cru,
|
|||||||
0xff, APLL_MODE_SHIFT, DPLL_MODE_SHIFT, 0xff,
|
0xff, APLL_MODE_SHIFT, DPLL_MODE_SHIFT, 0xff,
|
||||||
GPLL_MODE_SHIFT, 0xff
|
GPLL_MODE_SHIFT, 0xff
|
||||||
};
|
};
|
||||||
static u8 clk_mask[CLK_COUNT] = {
|
static u32 clk_mask[CLK_COUNT] = {
|
||||||
0xff, APLL_MODE_MASK, DPLL_MODE_MASK, 0xff,
|
0xffffffff, APLL_MODE_MASK, DPLL_MODE_MASK, 0xffffffff,
|
||||||
GPLL_MODE_MASK, 0xff
|
GPLL_MODE_MASK, 0xffffffff
|
||||||
};
|
};
|
||||||
uint shift;
|
uint shift;
|
||||||
uint mask;
|
uint mask;
|
||||||
@ -200,18 +191,18 @@ static uint32_t rkclk_pll_get_rate(struct rk3036_cru *cru,
|
|||||||
shift = clk_shift[clk_id];
|
shift = clk_shift[clk_id];
|
||||||
mask = clk_mask[clk_id];
|
mask = clk_mask[clk_id];
|
||||||
|
|
||||||
switch ((con >> shift) & mask) {
|
switch ((con & mask) >> shift) {
|
||||||
case GPLL_MODE_SLOW:
|
case GPLL_MODE_SLOW:
|
||||||
return OSC_HZ;
|
return OSC_HZ;
|
||||||
case GPLL_MODE_NORM:
|
case GPLL_MODE_NORM:
|
||||||
|
|
||||||
/* normal mode */
|
/* normal mode */
|
||||||
con = readl(&pll->con0);
|
con = readl(&pll->con0);
|
||||||
postdiv1 = (con >> PLL_POSTDIV1_SHIFT) & PLL_POSTDIV1_MASK;
|
postdiv1 = (con & PLL_POSTDIV1_MASK) >> PLL_POSTDIV1_SHIFT;
|
||||||
fbdiv = (con >> PLL_FBDIV_SHIFT) & PLL_FBDIV_MASK;
|
fbdiv = (con & PLL_FBDIV_MASK) >> PLL_FBDIV_SHIFT;
|
||||||
con = readl(&pll->con1);
|
con = readl(&pll->con1);
|
||||||
postdiv2 = (con >> PLL_POSTDIV2_SHIFT) & PLL_POSTDIV2_MASK;
|
postdiv2 = (con & PLL_POSTDIV2_MASK) >> PLL_POSTDIV2_SHIFT;
|
||||||
refdiv = (con >> PLL_REFDIV_SHIFT) & PLL_REFDIV_MASK;
|
refdiv = (con & PLL_REFDIV_MASK) >> PLL_REFDIV_SHIFT;
|
||||||
return (24 * fbdiv / (refdiv * postdiv1 * postdiv2)) * 1000000;
|
return (24 * fbdiv / (refdiv * postdiv1 * postdiv2)) * 1000000;
|
||||||
case GPLL_MODE_DEEP:
|
case GPLL_MODE_DEEP:
|
||||||
default:
|
default:
|
||||||
@ -230,14 +221,14 @@ static ulong rockchip_mmc_get_clk(struct rk3036_cru *cru, uint clk_general_rate,
|
|||||||
case HCLK_EMMC:
|
case HCLK_EMMC:
|
||||||
case SCLK_EMMC:
|
case SCLK_EMMC:
|
||||||
con = readl(&cru->cru_clksel_con[12]);
|
con = readl(&cru->cru_clksel_con[12]);
|
||||||
mux = (con >> EMMC_PLL_SHIFT) & EMMC_PLL_MASK;
|
mux = (con & EMMC_PLL_MASK) >> EMMC_PLL_SHIFT;
|
||||||
div = (con >> EMMC_DIV_SHIFT) & EMMC_DIV_MASK;
|
div = (con & EMMC_DIV_MASK) >> EMMC_DIV_SHIFT;
|
||||||
break;
|
break;
|
||||||
case HCLK_SDIO:
|
case HCLK_SDIO:
|
||||||
case SCLK_SDIO:
|
case SCLK_SDIO:
|
||||||
con = readl(&cru->cru_clksel_con[12]);
|
con = readl(&cru->cru_clksel_con[12]);
|
||||||
mux = (con >> MMC0_PLL_SHIFT) & MMC0_PLL_MASK;
|
mux = (con & MMC0_PLL_MASK) >> MMC0_PLL_SHIFT;
|
||||||
div = (con >> MMC0_DIV_SHIFT) & MMC0_DIV_MASK;
|
div = (con & MMC0_DIV_MASK) >> MMC0_DIV_SHIFT;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -269,16 +260,14 @@ static ulong rockchip_mmc_set_clk(struct rk3036_cru *cru, uint clk_general_rate,
|
|||||||
case HCLK_EMMC:
|
case HCLK_EMMC:
|
||||||
case SCLK_EMMC:
|
case SCLK_EMMC:
|
||||||
rk_clrsetreg(&cru->cru_clksel_con[12],
|
rk_clrsetreg(&cru->cru_clksel_con[12],
|
||||||
EMMC_PLL_MASK << EMMC_PLL_SHIFT |
|
EMMC_PLL_MASK | EMMC_DIV_MASK,
|
||||||
EMMC_DIV_MASK << EMMC_DIV_SHIFT,
|
|
||||||
mux << EMMC_PLL_SHIFT |
|
mux << EMMC_PLL_SHIFT |
|
||||||
(src_clk_div - 1) << EMMC_DIV_SHIFT);
|
(src_clk_div - 1) << EMMC_DIV_SHIFT);
|
||||||
break;
|
break;
|
||||||
case HCLK_SDIO:
|
case HCLK_SDIO:
|
||||||
case SCLK_SDIO:
|
case SCLK_SDIO:
|
||||||
rk_clrsetreg(&cru->cru_clksel_con[11],
|
rk_clrsetreg(&cru->cru_clksel_con[11],
|
||||||
MMC0_PLL_MASK << MMC0_PLL_SHIFT |
|
MMC0_PLL_MASK | MMC0_DIV_MASK,
|
||||||
MMC0_DIV_MASK << MMC0_DIV_SHIFT,
|
|
||||||
mux << MMC0_PLL_SHIFT |
|
mux << MMC0_PLL_SHIFT |
|
||||||
(src_clk_div - 1) << MMC0_DIV_SHIFT);
|
(src_clk_div - 1) << MMC0_DIV_SHIFT);
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user