diff options
| author | Tony Lindgren <tony@atomide.com> | 2008-03-18 05:56:39 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-04-14 13:29:38 -0400 |
| commit | a16e97037b518533569a778f0e997704e5c43796 (patch) | |
| tree | 0ab385008123a46d2a396d8aa1bf690a2f506fea /arch/arm/mach-omap2/clock24xx.h | |
| parent | 2150ef46f8b5b2a5e3e5c53c1b04c513276ad4f7 (diff) | |
ARM: OMAP2: Clean up 24xx clock code
Clean up 24xx clock code to sync it with linux-omap tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock24xx.h')
| -rw-r--r-- | arch/arm/mach-omap2/clock24xx.h | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h index ccf6a6ca5ce4..88081ed13f96 100644 --- a/arch/arm/mach-omap2/clock24xx.h +++ b/arch/arm/mach-omap2/clock24xx.h | |||
| @@ -1,13 +1,12 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/mach-omap24xx/clock.h | 2 | * linux/arch/arm/mach-omap2/clock24xx.h |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2005 Texas Instruments Inc. | 4 | * Copyright (C) 2005-2008 Texas Instruments, Inc. |
| 5 | * Richard Woodruff <r-woodruff2@ti.com> | 5 | * Copyright (C) 2004-2008 Nokia Corporation |
| 6 | * Created for OMAP2. | ||
| 7 | * | 6 | * |
| 8 | * Copyright (C) 2004 Nokia corporation | 7 | * Contacts: |
| 9 | * Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com> | 8 | * Richard Woodruff <r-woodruff2@ti.com> |
| 10 | * Based on clocks.h by Tony Lindgren, Gordon McNutt and RidgeRun, Inc | 9 | * Paul Walmsley |
| 11 | * | 10 | * |
| 12 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
| 13 | * it under the terms of the GNU General Public License version 2 as | 12 | * it under the terms of the GNU General Public License version 2 as |
| @@ -25,18 +24,18 @@ | |||
| 25 | #include "cm-regbits-24xx.h" | 24 | #include "cm-regbits-24xx.h" |
| 26 | #include "sdrc.h" | 25 | #include "sdrc.h" |
| 27 | 26 | ||
| 28 | static void omap2_table_mpu_recalc(struct clk * clk); | 27 | static void omap2_table_mpu_recalc(struct clk *clk); |
| 29 | static int omap2_select_table_rate(struct clk * clk, unsigned long rate); | 28 | static int omap2_select_table_rate(struct clk *clk, unsigned long rate); |
| 30 | static long omap2_round_to_table_rate(struct clk * clk, unsigned long rate); | 29 | static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate); |
| 31 | static void omap2_sys_clk_recalc(struct clk * clk); | 30 | static void omap2_sys_clk_recalc(struct clk *clk); |
| 32 | static void omap2_osc_clk_recalc(struct clk * clk); | 31 | static void omap2_osc_clk_recalc(struct clk *clk); |
| 33 | static void omap2_sys_clk_recalc(struct clk * clk); | 32 | static void omap2_sys_clk_recalc(struct clk *clk); |
| 34 | static void omap2_dpll_recalc(struct clk * clk); | 33 | static void omap2_dpll_recalc(struct clk *clk); |
| 35 | static int omap2_clk_fixed_enable(struct clk * clk); | 34 | static int omap2_clk_fixed_enable(struct clk *clk); |
| 36 | static void omap2_clk_fixed_disable(struct clk * clk); | 35 | static void omap2_clk_fixed_disable(struct clk *clk); |
| 37 | static int omap2_enable_osc_ck(struct clk * clk); | 36 | static int omap2_enable_osc_ck(struct clk *clk); |
| 38 | static void omap2_disable_osc_ck(struct clk * clk); | 37 | static void omap2_disable_osc_ck(struct clk *clk); |
| 39 | static int omap2_reprogram_dpll(struct clk * clk, unsigned long rate); | 38 | static int omap2_reprogram_dpll(struct clk *clk, unsigned long rate); |
| 40 | 39 | ||
| 41 | /* Key dividers which make up a PRCM set. Ratio's for a PRCM are mandated. | 40 | /* Key dividers which make up a PRCM set. Ratio's for a PRCM are mandated. |
| 42 | * xtal_speed, dpll_speed, mpu_speed, CM_CLKSEL_MPU,CM_CLKSEL_DSP | 41 | * xtal_speed, dpll_speed, mpu_speed, CM_CLKSEL_MPU,CM_CLKSEL_DSP |