diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
-rw-r--r-- | arch/arm/mach-omap2/clock.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 4716206547ac..5cb2dcb5b23e 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
@@ -149,6 +149,7 @@ static int _dpll_test_fint(struct clk *clk, u8 n) | |||
149 | * clockdomain pointer, and save it into the struct clk. Intended to be | 149 | * clockdomain pointer, and save it into the struct clk. Intended to be |
150 | * called during clk_register(). No return value. | 150 | * called during clk_register(). No return value. |
151 | */ | 151 | */ |
152 | #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ | ||
152 | void omap2_init_clk_clkdm(struct clk *clk) | 153 | void omap2_init_clk_clkdm(struct clk *clk) |
153 | { | 154 | { |
154 | struct clockdomain *clkdm; | 155 | struct clockdomain *clkdm; |
@@ -166,6 +167,7 @@ void omap2_init_clk_clkdm(struct clk *clk) | |||
166 | "clkdm %s\n", clk->name, clk->clkdm_name); | 167 | "clkdm %s\n", clk->name, clk->clkdm_name); |
167 | } | 168 | } |
168 | } | 169 | } |
170 | #endif | ||
169 | 171 | ||
170 | /** | 172 | /** |
171 | * omap2_init_clksel_parent - set a clksel clk's parent field from the hardware | 173 | * omap2_init_clksel_parent - set a clksel clk's parent field from the hardware |
@@ -437,8 +439,10 @@ void omap2_clk_disable(struct clk *clk) | |||
437 | _omap2_clk_disable(clk); | 439 | _omap2_clk_disable(clk); |
438 | if (clk->parent) | 440 | if (clk->parent) |
439 | omap2_clk_disable(clk->parent); | 441 | omap2_clk_disable(clk->parent); |
442 | #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ | ||
440 | if (clk->clkdm) | 443 | if (clk->clkdm) |
441 | omap2_clkdm_clk_disable(clk->clkdm, clk); | 444 | omap2_clkdm_clk_disable(clk->clkdm, clk); |
445 | #endif | ||
442 | 446 | ||
443 | } | 447 | } |
444 | } | 448 | } |
@@ -448,8 +452,10 @@ int omap2_clk_enable(struct clk *clk) | |||
448 | int ret = 0; | 452 | int ret = 0; |
449 | 453 | ||
450 | if (clk->usecount++ == 0) { | 454 | if (clk->usecount++ == 0) { |
455 | #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ | ||
451 | if (clk->clkdm) | 456 | if (clk->clkdm) |
452 | omap2_clkdm_clk_enable(clk->clkdm, clk); | 457 | omap2_clkdm_clk_enable(clk->clkdm, clk); |
458 | #endif | ||
453 | 459 | ||
454 | if (clk->parent) { | 460 | if (clk->parent) { |
455 | ret = omap2_clk_enable(clk->parent); | 461 | ret = omap2_clk_enable(clk->parent); |
@@ -468,8 +474,10 @@ int omap2_clk_enable(struct clk *clk) | |||
468 | return ret; | 474 | return ret; |
469 | 475 | ||
470 | err: | 476 | err: |
477 | #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ | ||
471 | if (clk->clkdm) | 478 | if (clk->clkdm) |
472 | omap2_clkdm_clk_disable(clk->clkdm, clk); | 479 | omap2_clkdm_clk_disable(clk->clkdm, clk); |
480 | #endif | ||
473 | clk->usecount--; | 481 | clk->usecount--; |
474 | return ret; | 482 | return ret; |
475 | } | 483 | } |