diff options
author | Paul Walmsley <paul@pwsan.com> | 2009-12-08 18:18:47 -0500 |
---|---|---|
committer | paul <paul@twilight.(none)> | 2009-12-11 18:12:15 -0500 |
commit | 82e9bd588563c4e22ebb55b684ebec7e310cc715 (patch) | |
tree | cad50e0c12980a14de3531ec7bf78e3f3e4a3313 /arch/arm/mach-omap2/clock24xx.c | |
parent | 75d43340113e3822e390f644e8b197737e4c553e (diff) |
OMAP3 clock: convert clock34xx.h to clock34xx_data.c
The OMAP3 clock code currently #includes a large .h file full of static
data structures. Instead, define the data in a .c file.
Russell King <linux@arm.linux.org.uk> proposed this new arrangement:
http://marc.info/?l=linux-omap&m=125967425908895&w=2
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/clock24xx.c')
-rw-r--r-- | arch/arm/mach-omap2/clock24xx.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index 5f201d228cc8..a4221741808e 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <plat/clock.h> | 31 | #include <plat/clock.h> |
32 | #include <plat/sram.h> | 32 | #include <plat/sram.h> |
33 | #include <plat/prcm.h> | 33 | #include <plat/prcm.h> |
34 | #include <plat/clkdev_omap.h> | ||
34 | #include <asm/div64.h> | 35 | #include <asm/div64.h> |
35 | #include <asm/clkdev.h> | 36 | #include <asm/clkdev.h> |
36 | 37 | ||
@@ -59,24 +60,6 @@ static const struct clkops clkops_omap2430_i2chs_wait = { | |||
59 | 60 | ||
60 | #include "clock24xx.h" | 61 | #include "clock24xx.h" |
61 | 62 | ||
62 | struct omap_clk { | ||
63 | u32 cpu; | ||
64 | struct clk_lookup lk; | ||
65 | }; | ||
66 | |||
67 | #define CLK(dev, con, ck, cp) \ | ||
68 | { \ | ||
69 | .cpu = cp, \ | ||
70 | .lk = { \ | ||
71 | .dev_id = dev, \ | ||
72 | .con_id = con, \ | ||
73 | .clk = ck, \ | ||
74 | }, \ | ||
75 | } | ||
76 | |||
77 | #define CK_243X RATE_IN_243X | ||
78 | #define CK_242X RATE_IN_242X | ||
79 | |||
80 | static struct omap_clk omap24xx_clks[] = { | 63 | static struct omap_clk omap24xx_clks[] = { |
81 | /* external root sources */ | 64 | /* external root sources */ |
82 | CLK(NULL, "func_32k_ck", &func_32k_ck, CK_243X | CK_242X), | 65 | CLK(NULL, "func_32k_ck", &func_32k_ck, CK_243X | CK_242X), |
@@ -658,7 +641,7 @@ void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) | |||
658 | } | 641 | } |
659 | #endif | 642 | #endif |
660 | 643 | ||
661 | static struct clk_functions omap2_clk_functions = { | 644 | struct clk_functions omap2_clk_functions = { |
662 | .clk_enable = omap2_clk_enable, | 645 | .clk_enable = omap2_clk_enable, |
663 | .clk_disable = omap2_clk_disable, | 646 | .clk_disable = omap2_clk_disable, |
664 | .clk_round_rate = omap2_clk_round_rate, | 647 | .clk_round_rate = omap2_clk_round_rate, |