linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm / arch-omap / clock.h

diff --git a/include/asm-arm/arch-omap/clock.h b/include/asm-arm/arch-omap/clock.h
index f83003f..46a0402 100644 (file)
--- a/include/asm-arm/arch-omap/clock.h
+++ b/include/asm-arm/arch-omap/clock.h
@@ -19,7 +19,6 @@ struct clk {
        struct list_head        node;
        struct module           *owner;
        const char              *name;
-       int                     id;
        struct clk              *parent;
        unsigned long           rate;
        __u32                   flags;
@@ -48,6 +47,8 @@ struct clk_functions {
 };
 
 extern unsigned int mpurate;
+extern struct list_head clocks;
+extern spinlock_t clockfw_lock;
 
 extern int clk_init(struct clk_functions * custom_clocks);
 extern int clk_register(struct clk *clk);
@@ -56,7 +57,6 @@ extern void propagate_rate(struct clk *clk);
 extern void followparent_recalc(struct clk * clk);
 extern void clk_allow_idle(struct clk *clk);
 extern void clk_deny_idle(struct clk *clk);
-extern int clk_get_usecount(struct clk *clk);
 
 /* Clock flags */
 #define RATE_CKCTL             (1 << 0)        /* Main fixed ratio clocks */
@@ -80,11 +80,10 @@ extern int clk_get_usecount(struct clk *clk);
 #define CM_PLL_SEL1            (1 << 18)
 #define CM_PLL_SEL2            (1 << 19)
 #define CM_SYSCLKOUT_SEL1      (1 << 20)
-#define CLOCK_IN_OMAP310       (1 << 21)
-#define CLOCK_IN_OMAP730       (1 << 22)
-#define CLOCK_IN_OMAP1510      (1 << 23)
-#define CLOCK_IN_OMAP16XX      (1 << 24)
-#define CLOCK_IN_OMAP242X      (1 << 25)
-#define CLOCK_IN_OMAP243X      (1 << 26)
+#define CLOCK_IN_OMAP730       (1 << 21)
+#define CLOCK_IN_OMAP1510      (1 << 22)
+#define CLOCK_IN_OMAP16XX      (1 << 23)
+#define CLOCK_IN_OMAP242X      (1 << 24)
+#define CLOCK_IN_OMAP243X      (1 << 25)
 
 #endif