aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock24xx.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2009-12-08 16:18:47 -0700
committerpaul <paul@twilight.(none)>2009-12-11 16:12:15 -0700
commit82e9bd588563c4e22ebb55b684ebec7e310cc715 (patch)
treecad50e0c12980a14de3531ec7bf78e3f3e4a3313 /arch/arm/mach-omap2/clock24xx.c
parentOMAP2xxx clock: remove implicit dependency between rate CPU flag and clkdev_omap CPU flag (diff)
downloadlinux-dev-82e9bd588563c4e22ebb55b684ebec7e310cc715.tar.xz
linux-dev-82e9bd588563c4e22ebb55b684ebec7e310cc715.zip
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.c21
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 @@
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/prcm.h>
+#include <plat/clkdev_omap.h>
#include <asm/div64.h>
#include <asm/clkdev.h>
@@ -59,24 +60,6 @@ static const struct clkops clkops_omap2430_i2chs_wait = {
#include "clock24xx.h"
-struct omap_clk {
- u32 cpu;
- struct clk_lookup lk;
-};
-
-#define CLK(dev, con, ck, cp) \
- { \
- .cpu = cp, \
- .lk = { \
- .dev_id = dev, \
- .con_id = con, \
- .clk = ck, \
- }, \
- }
-
-#define CK_243X RATE_IN_243X
-#define CK_242X RATE_IN_242X
-
static struct omap_clk omap24xx_clks[] = {
/* external root sources */
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)
}
#endif
-static struct clk_functions omap2_clk_functions = {
+struct clk_functions omap2_clk_functions = {
.clk_enable = omap2_clk_enable,
.clk_disable = omap2_clk_disable,
.clk_round_rate = omap2_clk_round_rate,