[PATCH] ARM: OMAP2+: Fix bogus struct clk comparison for timer clock

Tony Lindgren tony at atomide.com
Tue May 5 11:02:21 PDT 2015

With recent changes to use determine_rate, the comparison of two
clocks won't work without doing __clk_get_hw on the clocks

Cc: Michael Turquette <mturquette at linaro.org>
Cc: Paul Walmsley <paul at pwsan.com>
Cc: Stephen Boyd <sboyd at codeaurora.org>
Cc: Tero Kristo <t-kristo at ti.com>
Cc: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Signed-off-by: Tony Lindgren <tony at atomide.com>

Found one more of these, the coccinelle scripts do not seem
to match this?

 arch/arm/mach-omap2/timer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index cef67af..22c7a8e 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -35,6 +35,7 @@
 #include <linux/irq.h>
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
+#include <linux/clk-provider.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
@@ -298,7 +299,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
 	if (IS_ERR(src))
 		return PTR_ERR(src);
-	if (clk_get_parent(timer->fclk) != src) {
+	if (__clk_get_hw(clk_get_parent(timer->fclk)) != __clk_get_hw(src)) {
 		r = clk_set_parent(timer->fclk, src);
 		if (r < 0) {
 			pr_warn("%s: %s cannot set source\n", __func__,

More information about the linux-arm-kernel mailing list