aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock.h
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2009-12-08 18:21:29 -0500
committerpaul <paul@twilight.(none)>2009-12-11 18:16:00 -0500
commitd8a944582da1a4d29a1487ff7f435643505a12a0 (patch)
tree1e1d946c578c4d5108c86f24f932f55da936ee5d /arch/arm/mach-omap2/clock.h
parent82e9bd588563c4e22ebb55b684ebec7e310cc715 (diff)
OMAP2 clock: convert clock24xx.h to clock2xxx_data.c, opp2xxx*
The OMAP2 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 This patch also deals with most of the flagrant checkpatch violations. While here, separate the prcm_config data structures out into their own files, opp2xxx.h and opp24{2,3}0_data.c, and only build in the OPP tables for the target device. This should save some memory. In the long run, these prcm_config tables should be replaced with OPP code. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Richard Woodruff <r-woodruff2@ti.com> Cc: Nishanth Menon <nm@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock.h')
-rw-r--r--arch/arm/mach-omap2/clock.h30
1 files changed, 8 insertions, 22 deletions
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index b1991e39961a..87c08056b303 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -1,8 +1,8 @@
1/* 1/*
2 * linux/arch/arm/mach-omap2/clock.h 2 * linux/arch/arm/mach-omap2/clock.h
3 * 3 *
4 * Copyright (C) 2005-2008 Texas Instruments, Inc. 4 * Copyright (C) 2005-2009 Texas Instruments, Inc.
5 * Copyright (C) 2004-2008 Nokia Corporation 5 * Copyright (C) 2004-2009 Nokia Corporation
6 * 6 *
7 * Contacts: 7 * Contacts:
8 * Richard Woodruff <r-woodruff2@ti.com> 8 * Richard Woodruff <r-woodruff2@ti.com>
@@ -72,31 +72,17 @@ void omap2_clk_dflt_find_companion(struct clk *clk, void __iomem **other_reg,
72void omap2_clk_dflt_find_idlest(struct clk *clk, void __iomem **idlest_reg, 72void omap2_clk_dflt_find_idlest(struct clk *clk, void __iomem **idlest_reg,
73 u8 *idlest_bit); 73 u8 *idlest_bit);
74 74
75extern u8 cpu_mask;
76
75extern const struct clkops clkops_omap2_dflt_wait; 77extern const struct clkops clkops_omap2_dflt_wait;
76extern const struct clkops clkops_omap2_dflt; 78extern const struct clkops clkops_omap2_dflt;
77 79
78extern u8 cpu_mask;
79
80extern struct clk_functions omap2_clk_functions; 80extern struct clk_functions omap2_clk_functions;
81extern struct clk *vclk, *sclk;
81 82
82/* clksel_rate data common to 24xx/343x */ 83extern const struct clksel_rate gpt_32k_rates[];
83static const struct clksel_rate gpt_32k_rates[] = { 84extern const struct clksel_rate gpt_sys_rates[];
84 { .div = 1, .val = 0, .flags = RATE_IN_24XX | RATE_IN_343X | DEFAULT_RATE }, 85extern const struct clksel_rate gfx_l3_rates[];
85 { .div = 0 }
86};
87
88static const struct clksel_rate gpt_sys_rates[] = {
89 { .div = 1, .val = 1, .flags = RATE_IN_24XX | RATE_IN_343X | DEFAULT_RATE },
90 { .div = 0 }
91};
92
93static const struct clksel_rate gfx_l3_rates[] = {
94 { .div = 1, .val = 1, .flags = RATE_IN_24XX | RATE_IN_343X },
95 { .div = 2, .val = 2, .flags = RATE_IN_24XX | RATE_IN_343X | DEFAULT_RATE },
96 { .div = 3, .val = 3, .flags = RATE_IN_243X | RATE_IN_343X },
97 { .div = 4, .val = 4, .flags = RATE_IN_243X | RATE_IN_343X },
98 { .div = 0 }
99};
100 86
101 87
102#endif 88#endif