This is a note to let you know that I've just added the patch titled
clk: qcom: Use parent rate when set rate to pixel RCG clock
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
clk-qcom-use-parent-rate-when-set-rate-to-pixel-rcg-clock.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6d451367bfa16fc103604bacd258f534c65d1540 Mon Sep 17 00:00:00 2001
From: Hai Li <hali@xxxxxxxxxxxxxx>
Date: Thu, 25 Jun 2015 18:35:33 -0400
Subject: clk: qcom: Use parent rate when set rate to pixel RCG clock
From: Hai Li <hali@xxxxxxxxxxxxxx>
commit 6d451367bfa16fc103604bacd258f534c65d1540 upstream.
Since the parent rate has been recalculated, pixel RCG clock
should rely on it to find the correct M/N values during set_rate,
instead of calling __clk_round_rate() to its parent again.
Signed-off-by: Hai Li <hali@xxxxxxxxxxxxxx>
Tested-by: Archit Taneja <architt@xxxxxxxxxxxxxx>
Fixes: 99cbd064b059 ("clk: qcom: Support display RCG clocks")
[sboyd@xxxxxxxxxxxxxx: Silenced unused parent variable warning]
Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/clk/qcom/clk-rcg2.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
--- a/drivers/clk/qcom/clk-rcg2.c
+++ b/drivers/clk/qcom/clk-rcg2.c
@@ -530,19 +530,16 @@ static int clk_pixel_set_rate(struct clk
struct clk_rcg2 *rcg = to_clk_rcg2(hw);
struct freq_tbl f = *rcg->freq_tbl;
const struct frac_entry *frac = frac_table_pixel;
- unsigned long request, src_rate;
+ unsigned long request;
int delta = 100000;
u32 mask = BIT(rcg->hid_width) - 1;
u32 hid_div;
- int index = qcom_find_src_index(hw, rcg->parent_map, f.src);
- struct clk *parent = clk_get_parent_by_index(hw->clk, index);
for (; frac->num; frac++) {
request = (rate * frac->den) / frac->num;
- src_rate = __clk_round_rate(parent, request);
- if ((src_rate < (request - delta)) ||
- (src_rate > (request + delta)))
+ if ((parent_rate < (request - delta)) ||
+ (parent_rate > (request + delta)))
continue;
regmap_read(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG,
Patches currently in stable-queue which might be from hali@xxxxxxxxxxxxxx are
queue-4.1/clk-qcom-use-parent-rate-when-set-rate-to-pixel-rcg-clock.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html