提交 bca45808 编写于 作者: J Jon Hunter 提交者: Tony Lindgren

ARM: OMAP1: Fix dmtimer support

OMAP1 dmtimer support is currently broken. When a dmtimer is requested by the
omap_dm_timer_request() function fails to allocate a dmtimer because the call
to clk_get() inside omap_dm_timer_prepare fails. The clk_get() fails simply
because the clock data for the OMAP1 dmtimers is not present.

Ideally this should be fixed by moving OMAP1 dmtimers to use the clock
framework. For now simply fix this by using the "TIMER_NEEDS_RESET" flag to
identify an OMAP1 device and avoid calling clk_get(). Although this is not
the ideal fix and should be corrected, this flag has already been use for the
same purpose in omap_dm_timer_stop().
Signed-off-by: NJon Hunter <jon-hunter@ti.com>
Signed-off-by: NTony Lindgren <tony@atomide.com>
上级 6615975b
...@@ -137,11 +137,17 @@ int omap_dm_timer_prepare(struct omap_dm_timer *timer) ...@@ -137,11 +137,17 @@ int omap_dm_timer_prepare(struct omap_dm_timer *timer)
{ {
int ret; int ret;
timer->fclk = clk_get(&timer->pdev->dev, "fck"); /*
if (WARN_ON_ONCE(IS_ERR_OR_NULL(timer->fclk))) { * FIXME: OMAP1 devices do not use the clock framework for dmtimers so
timer->fclk = NULL; * do not call clk_get() for these devices.
dev_err(&timer->pdev->dev, ": No fclk handle.\n"); */
return -EINVAL; if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {
timer->fclk = clk_get(&timer->pdev->dev, "fck");
if (WARN_ON_ONCE(IS_ERR_OR_NULL(timer->fclk))) {
timer->fclk = NULL;
dev_err(&timer->pdev->dev, ": No fclk handle.\n");
return -EINVAL;
}
} }
if (timer->capability & OMAP_TIMER_NEEDS_RESET) if (timer->capability & OMAP_TIMER_NEEDS_RESET)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册