| Message ID | 1469779021-10426-2-git-send-email-hl@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Freitag, 29. Juli 2016, 15:56:55 schrieb Lin Huang: > From: Heiko Stübner <heiko@sntech.de> > > add clock flag parameter so we can pass specific clock flag > (like CLK_GET_RATE_NOCACHE etc..)to pll driver. > > Signed-off-by: Heiko Stübner <heiko@sntech.de> > Signed-off-by: Lin Huang <hl@rock-chips.com> applied to my clock branch for 4.9 after some minor edits on the commit message. Thanks Heiko
Hi Heiko, On 2016年08月05日 06:37, Heiko Stuebner wrote: > Am Freitag, 29. Juli 2016, 15:56:55 schrieb Lin Huang: >> From: Heiko Stübner <heiko@sntech.de> >> >> add clock flag parameter so we can pass specific clock flag >> (like CLK_GET_RATE_NOCACHE etc..)to pll driver. >> >> Signed-off-by: Heiko Stübner <heiko@sntech.de> >> Signed-off-by: Lin Huang <hl@rock-chips.com> > applied to my clock branch for 4.9 after some minor edits on the commit > message. I can not found your clock branch for 4.9, can you share me the patch ID, i want cherry-pick it to my downstream branch. > > Thanks > Heiko > >
Hi Lin, Am Freitag, 5. August 2016, 16:50:49 schrieb hl: > On 2016年08月05日 06:37, Heiko Stuebner wrote: > > Am Freitag, 29. Juli 2016, 15:56:55 schrieb Lin Huang: > >> From: Heiko Stübner <heiko@sntech.de> > >> > >> add clock flag parameter so we can pass specific clock flag > >> (like CLK_GET_RATE_NOCACHE etc..)to pll driver. > >> > >> Signed-off-by: Heiko Stübner <heiko@sntech.de> > >> Signed-off-by: Lin Huang <hl@rock-chips.com> > > > > applied to my clock branch for 4.9 after some minor edits on the commit > > message. > > I can not found your clock branch for 4.9, can you share me the patch > ID, i want > cherry-pick it to my downstream branch. sorry forgot to push yesterday evening. The patch is at [0]. Please keep in mind, that I'll rebase that branch onto 4.8-rc1 once it gets released on sunday. So the commit id is volatile till then. [Same is true for all my 4.9 branch of course, I just pick patches already to reduce the number of patches in my inbox :-) ] Heiko [0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/commit/?h=v4.9-clk/next&id=24bdd1a5a2cc706b8c4820a1976dd4eed56716e4
diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c index 8ac73bc..d824c36 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c @@ -864,7 +864,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, u8 num_parents, int con_offset, int grf_lock_offset, int lock_shift, int mode_offset, int mode_shift, struct rockchip_pll_rate_table *rate_table, - u8 clk_pll_flags) + unsigned long flags, u8 clk_pll_flags) { const char *pll_parents[3]; struct clk_init_data init; @@ -919,7 +919,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, init.name = pll_name; /* keep all plls untouched for now */ - init.flags = CLK_IGNORE_UNUSED; + init.flags = flags | CLK_IGNORE_UNUSED; init.parent_names = &parent_names[0]; init.num_parents = 1; diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c index f0a8be1..9a046f1 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -390,7 +390,7 @@ void __init rockchip_clk_register_plls(struct rockchip_clk_provider *ctx, list->con_offset, grf_lock_offset, list->lock_shift, list->mode_offset, list->mode_shift, list->rate_table, - list->pll_flags); + list->flags, list->pll_flags); if (IS_ERR(clk)) { pr_err("%s: failed to register clock %s\n", __func__, list->name); diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h index 1abb7d0..bac775d 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -238,7 +238,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, u8 num_parents, int con_offset, int grf_lock_offset, int lock_shift, int mode_offset, int mode_shift, struct rockchip_pll_rate_table *rate_table, - u8 clk_pll_flags); + unsigned long flags, u8 clk_pll_flags); struct rockchip_cpuclk_clksel { int reg;