FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 09:56:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clk: rockchip: add new pll-type for rk3328

Browse Source 
The rk3328's pll and clock are similar with rk3036's,
it different with pll_mode_mask, the rk3328 soc
pll mode only one bit(rk3036 soc have two bits)
so these should be independent and separate from
the series of rk3328s.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Elaine Zhang 2016-12-29 10:45:10 +08:00 committed by Heiko Stuebner
parent 4d3e84f996
commit 7bed92460d
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/clk/rockchip/clk-pll.c
View File

@ -29,6 +29,7 @@
#define PLL_MODE_SLOW 0x0 #define PLL_MODE_SLOW 0x0
#define PLL_MODE_NORM 0x1 #define PLL_MODE_NORM 0x1
#define PLL_MODE_DEEP 0x2 #define PLL_MODE_DEEP 0x2
#define PLL_RK3328_MODE_MASK 0x1
struct rockchip_clk_pll { struct rockchip_clk_pll {
struct clk_hw hw; struct clk_hw hw;
@ -848,7 +849,8 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,
struct clk *pll_clk, *mux_clk; struct clk *pll_clk, *mux_clk;
char pll_name[20]; char pll_name[20];
if (num_parents != 2) { if ((pll_type != pll_rk3328 && num_parents != 2) ||
(pll_type == pll_rk3328 && num_parents != 1)) {
pr_err("%s: needs two parent clocks\n", __func__); pr_err("%s: needs two parent clocks\n", __func__);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
@ -865,13 +867,17 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,
pll_mux = &pll->pll_mux; pll_mux = &pll->pll_mux;
pll_mux->reg = ctx->reg_base + mode_offset; pll_mux->reg = ctx->reg_base + mode_offset;
pll_mux->shift = mode_shift; pll_mux->shift = mode_shift;
pll_mux->mask = PLL_MODE_MASK; if (pll_type == pll_rk3328)
pll_mux->mask = PLL_RK3328_MODE_MASK;
else
pll_mux->mask = PLL_MODE_MASK;
pll_mux->flags = 0; pll_mux->flags = 0;
pll_mux->lock = &ctx->lock; pll_mux->lock = &ctx->lock;
pll_mux->hw.init = &init; pll_mux->hw.init = &init;
if (pll_type == pll_rk3036 || if (pll_type == pll_rk3036 ||
pll_type == pll_rk3066 || pll_type == pll_rk3066 ||
pll_type == pll_rk3328 ||
pll_type == pll_rk3399) pll_type == pll_rk3399)
pll_mux->flags |= CLK_MUX_HIWORD_MASK; pll_mux->flags |= CLK_MUX_HIWORD_MASK;
@ -884,7 +890,10 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,
init.flags = CLK_SET_RATE_PARENT; init.flags = CLK_SET_RATE_PARENT;
init.ops = pll->pll_mux_ops; init.ops = pll->pll_mux_ops;
init.parent_names = pll_parents; init.parent_names = pll_parents;
init.num_parents = ARRAY_SIZE(pll_parents); if (pll_type == pll_rk3328)
init.num_parents = 2;
else
init.num_parents = ARRAY_SIZE(pll_parents);
mux_clk = clk_register(NULL, &pll_mux->hw); mux_clk = clk_register(NULL, &pll_mux->hw);
if (IS_ERR(mux_clk)) if (IS_ERR(mux_clk))
@ -918,6 +927,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,
switch (pll_type) { switch (pll_type) {
case pll_rk3036: case pll_rk3036:
case pll_rk3328:
if (!pll->rate_table || IS_ERR(ctx->grf)) if (!pll->rate_table || IS_ERR(ctx->grf))
init.ops = &rockchip_rk3036_pll_clk_norate_ops; init.ops = &rockchip_rk3036_pll_clk_norate_ops;
else else

1
drivers/clk/rockchip/clk.h
View File

@ -130,6 +130,7 @@ struct clk;
enum rockchip_pll_type { enum rockchip_pll_type {
pll_rk3036, pll_rk3036,
pll_rk3066, pll_rk3066,
pll_rk3328,
pll_rk3399, pll_rk3399,
}; };