summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2014-11-14 15:32:09 +0000
committerMichael Turquette <mturquette@linaro.org>2014-11-17 11:13:52 -0800
commite6d5e7d90be92cee626d7ec16ca9b06f1eed710b (patch)
treeb1fa0b4d8e1ab37e13a4ac68611ff90300f31883 /include
parent9a6cb70f40b0268297024949eb0a2689e3b7769b (diff)
downloadlinux-stable-e6d5e7d90be92cee626d7ec16ca9b06f1eed710b.tar.gz
linux-stable-e6d5e7d90be92cee626d7ec16ca9b06f1eed710b.tar.bz2
linux-stable-e6d5e7d90be92cee626d7ec16ca9b06f1eed710b.zip
clk-divider: Fix READ_ONLY when divider > 1
Commit 79c6ab509558 (clk: divider: add CLK_DIVIDER_READ_ONLY flag) in v3.16 introduced the CLK_DIVIDER_READ_ONLY flag which caused the recalc_rate() and round_rate() clock callbacks to be omitted. However using this flag has the unfortunate side effect of causing the clock recalculation code when a clock rate change is attempted to always treat it as a pass-through clock, i.e. with a fixed divide of 1, which may not be the case. Child clock rates are then recalculated using the wrong parent rate. Therefore instead of dropping the recalc_rate() and round_rate() callbacks, alter clk_divider_bestdiv() to always report the current divider as the best divider so that it is never altered. For me the read only clock was the system clock, which divided the PLL rate by 2, from which both the UART and the SPI clocks were divided. Initial setting of the UART rate set it correctly, but when the SPI clock was set, the other child clocks were miscalculated. The UART clock was recalculated using the PLL rate as the parent rate, resulting in a UART new_rate of double what it should be, and a UART which spewed forth garbage when the rate changes were propagated. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Thomas Abraham <thomas.ab@samsung.com> Cc: Tomasz Figa <t.figa@samsung.com> Cc: Max Schwarz <max.schwarz@online.de> Cc: <stable@vger.kernel.org> # v3.16+ Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Michael Turquette <mturquette@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/clk-provider.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index be21af149f11..2839c639f092 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -352,7 +352,6 @@ struct clk_divider {
#define CLK_DIVIDER_READ_ONLY BIT(5)
extern const struct clk_ops clk_divider_ops;
-extern const struct clk_ops clk_divider_ro_ops;
struct clk *clk_register_divider(struct device *dev, const char *name,
const char *parent_name, unsigned long flags,
void __iomem *reg, u8 shift, u8 width,