diff options
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
-rw-r--r-- | arch/arm/mach-omap1/clock.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index f8e12946862c..8aee42c3f5bf 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
@@ -432,8 +432,7 @@ static int omap1_clk_enable(struct clk *clk) | |||
432 | } | 432 | } |
433 | 433 | ||
434 | if (clk->flags & CLOCK_NO_IDLE_PARENT) | 434 | if (clk->flags & CLOCK_NO_IDLE_PARENT) |
435 | if (!cpu_is_omap24xx()) | 435 | omap1_clk_deny_idle(clk->parent); |
436 | omap1_clk_deny_idle(clk->parent); | ||
437 | } | 436 | } |
438 | 437 | ||
439 | ret = clk->enable(clk); | 438 | ret = clk->enable(clk); |
@@ -454,8 +453,7 @@ static void omap1_clk_disable(struct clk *clk) | |||
454 | if (likely(clk->parent)) { | 453 | if (likely(clk->parent)) { |
455 | omap1_clk_disable(clk->parent); | 454 | omap1_clk_disable(clk->parent); |
456 | if (clk->flags & CLOCK_NO_IDLE_PARENT) | 455 | if (clk->flags & CLOCK_NO_IDLE_PARENT) |
457 | if (!cpu_is_omap24xx()) | 456 | omap1_clk_allow_idle(clk->parent); |
458 | omap1_clk_allow_idle(clk->parent); | ||
459 | } | 457 | } |
460 | } | 458 | } |
461 | } | 459 | } |
@@ -471,7 +469,7 @@ static int omap1_clk_enable_generic(struct clk *clk) | |||
471 | if (unlikely(clk->enable_reg == 0)) { | 469 | if (unlikely(clk->enable_reg == 0)) { |
472 | printk(KERN_ERR "clock.c: Enable for %s without enable code\n", | 470 | printk(KERN_ERR "clock.c: Enable for %s without enable code\n", |
473 | clk->name); | 471 | clk->name); |
474 | return 0; | 472 | return -EINVAL; |
475 | } | 473 | } |
476 | 474 | ||
477 | if (clk->flags & ENABLE_REG_32BIT) { | 475 | if (clk->flags & ENABLE_REG_32BIT) { |
@@ -496,7 +494,7 @@ static int omap1_clk_enable_generic(struct clk *clk) | |||
496 | } | 494 | } |
497 | } | 495 | } |
498 | 496 | ||
499 | return; | 497 | return 0; |
500 | } | 498 | } |
501 | 499 | ||
502 | static void omap1_clk_disable_generic(struct clk *clk) | 500 | static void omap1_clk_disable_generic(struct clk *clk) |