[PATCH 1/4] ARM: OMAP: dmtimer: check for fixed timers during config
From: Suman Anna <hidden>
Date: 2015-10-01 19:32:37
Also in:
linux-arm-kernel, linux-omap
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2015-10-05 · Re: [PATCH 1/4] ARM: OMAP: dmtimer: check for fixed timers during config · Suman Anna <hidden>
- 2015-10-05 · Re: [PATCH 1/4] ARM: OMAP: dmtimer: check for fixed timers during config · Tony Lindgren <hidden>
- 2015-10-05 · Re: [PATCH 1/4] ARM: OMAP: dmtimer: check for fixed timers during config · Suman Anna <hidden>
- 2015-10-03 · Re: [PATCH 1/4] ARM: OMAP: dmtimer: check for fixed timers during config · kbuild test robot <hidden>
The omap_dm_timer_set_source() function provides a means for client users to configure the mux parent for a GPTimer's functional clock. However, not all timers are configurable (Eg: Timer12 on DRA7 is fed by an internal 32k oscillator clock, and does not have configurable parent clocks). So, check for such cases and proceed with out throwing an error. Signed-off-by: Suman Anna <redacted> --- arch/arm/plat-omap/dmtimer.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 8ca94d379bc3..25693e722f1f 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c@@ -36,6 +36,7 @@ */ #include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/module.h> #include <linux/io.h> #include <linux/device.h>
@@ -504,6 +505,10 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source) if (IS_ERR(timer->fclk)) return -EINVAL; + /* Check if the clock has parents if not no point checking */ + if (!clk_hw_get_num_parents(__clk_get_hw(timer->fclk))) + return 0; + switch (source) { case OMAP_TIMER_SRC_SYS_CLK: parent_name = "timer_sys_ck";
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html