diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-29 14:33:19 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 12:50:41 -0500 |
commit | b5088c0d90b898802318c62caf2320a53df6ce57 (patch) | |
tree | d2f29d7eb35b76a056f6fb1ad64acc1d26be0550 /arch/arm/mach-omap2 | |
parent | 7b0f89d7bba946345fd597110388da5a913e9744 (diff) |
[ARM] omap: clks: call recalc after any rate change
This implements the remainder of:
OMAP clock: move rate recalc, propagation code up to plat-omap/clock.c
from Paul Walmsley which is not covered by the previous:
[ARM] omap: move clock propagation into core omap clock code
[ARM] omap: remove unnecessary calls to propagate_rate()
[ARM] omap: move propagate_rate() calls into generic omap clock code
commits.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/clock24xx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock34xx.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index 2ce8c0296e82..4564ae32ae02 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
@@ -441,7 +441,6 @@ static int omap2_reprogram_dpllcore(struct clk *clk, unsigned long rate) | |||
441 | omap2xxx_sdrc_init_params(omap2xxx_sdrc_dll_is_unlocked()); | 441 | omap2xxx_sdrc_init_params(omap2xxx_sdrc_dll_is_unlocked()); |
442 | omap2xxx_sdrc_reprogram(done_rate, 0); | 442 | omap2xxx_sdrc_reprogram(done_rate, 0); |
443 | } | 443 | } |
444 | omap2_dpllcore_recalc(&dpll_ck); | ||
445 | ret = 0; | 444 | ret = 0; |
446 | 445 | ||
447 | dpll_exit: | 446 | dpll_exit: |
@@ -570,7 +569,6 @@ static int omap2_select_table_rate(struct clk *clk, unsigned long rate) | |||
570 | 569 | ||
571 | local_irq_restore(flags); | 570 | local_irq_restore(flags); |
572 | } | 571 | } |
573 | omap2_dpllcore_recalc(&dpll_ck); | ||
574 | 572 | ||
575 | return 0; | 573 | return 0; |
576 | } | 574 | } |
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 06a81febe457..75eb2546bb06 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c | |||
@@ -614,8 +614,6 @@ static int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate) | |||
614 | omap3_noncore_dpll_program(clk, dd->last_rounded_m, dd->last_rounded_n, | 614 | omap3_noncore_dpll_program(clk, dd->last_rounded_m, dd->last_rounded_n, |
615 | freqsel); | 615 | freqsel); |
616 | 616 | ||
617 | omap3_dpll_recalc(clk); | ||
618 | |||
619 | return 0; | 617 | return 0; |
620 | } | 618 | } |
621 | 619 | ||
@@ -693,8 +691,6 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) | |||
693 | sp->actim_ctrlb, new_div); | 691 | sp->actim_ctrlb, new_div); |
694 | local_irq_enable(); | 692 | local_irq_enable(); |
695 | 693 | ||
696 | omap2_clksel_recalc(clk); | ||
697 | |||
698 | return 0; | 694 | return 0; |
699 | } | 695 | } |
700 | 696 | ||