aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/mach/clock.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/plat-omap/include/mach/clock.h')
-rw-r--r--arch/arm/plat-omap/include/mach/clock.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/mach/clock.h b/arch/arm/plat-omap/include/mach/clock.h
index 8705902de1d6..af6ae4fa46d6 100644
--- a/arch/arm/plat-omap/include/mach/clock.h
+++ b/arch/arm/plat-omap/include/mach/clock.h
@@ -70,6 +70,8 @@ struct clk {
70 const char *name; 70 const char *name;
71 int id; 71 int id;
72 struct clk *parent; 72 struct clk *parent;
73 struct list_head children;
74 struct list_head sibling; /* node for children */
73 unsigned long rate; 75 unsigned long rate;
74 __u32 flags; 76 __u32 flags;
75 void __iomem *enable_reg; 77 void __iomem *enable_reg;
@@ -115,7 +117,9 @@ struct clk_functions {
115extern unsigned int mpurate; 117extern unsigned int mpurate;
116 118
117extern int clk_init(struct clk_functions *custom_clocks); 119extern int clk_init(struct clk_functions *custom_clocks);
120extern void clk_init_one(struct clk *clk);
118extern int clk_register(struct clk *clk); 121extern int clk_register(struct clk *clk);
122extern void clk_reparent(struct clk *child, struct clk *parent);
119extern void clk_unregister(struct clk *clk); 123extern void clk_unregister(struct clk *clk);
120extern void propagate_rate(struct clk *clk); 124extern void propagate_rate(struct clk *clk);
121extern void recalculate_root_clocks(void); 125extern void recalculate_root_clocks(void);
@@ -131,8 +135,7 @@ extern const struct clkops clkops_null;
131/* Clock flags */ 135/* Clock flags */
132/* bit 0 is free */ 136/* bit 0 is free */
133#define RATE_FIXED (1 << 1) /* Fixed clock rate */ 137#define RATE_FIXED (1 << 1) /* Fixed clock rate */
134#define RATE_PROPAGATES (1 << 2) /* Program children too */ 138/* bits 2-4 are free */
135/* bits 3-4 are free */
136#define ENABLE_REG_32BIT (1 << 5) /* Use 32-bit access */ 139#define ENABLE_REG_32BIT (1 << 5) /* Use 32-bit access */
137#define CLOCK_IDLE_CONTROL (1 << 7) 140#define CLOCK_IDLE_CONTROL (1 << 7)
138#define CLOCK_NO_IDLE_PARENT (1 << 8) 141#define CLOCK_NO_IDLE_PARENT (1 << 8)