Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / arch / arm / mach-msm / clock.h

diff --git a/arch/arm/mach-msm/clock.h b/arch/arm/mach-msm/clock.h
index 6a0cadeabb9d409da3abaa28b6e7cf8847e1099b..2c007f606d2921e61d8692bd7a3e288cf08d588b 100644 (file)
--- a/arch/arm/mach-msm/clock.h
+++ b/arch/arm/mach-msm/clock.h
@@ -17,6 +17,7 @@
 #ifndef __ARCH_ARM_MACH_MSM_CLOCK_H
 #define __ARCH_ARM_MACH_MSM_CLOCK_H
 
+#include <linux/init.h>
 #include <linux/list.h>
 #include <mach/clk.h>
 
@@ -42,6 +43,7 @@ struct clk_ops {
        unsigned (*get_rate)(unsigned id);
        unsigned (*is_enabled)(unsigned id);
        long (*round_rate)(unsigned id, unsigned rate);
+       bool (*is_local)(unsigned id);
 };
 
 struct clk {
@@ -49,11 +51,9 @@ struct clk {
        uint32_t remote_id;
        uint32_t count;
        uint32_t flags;
-       const char *name;
        struct clk_ops *ops;
        const char *dbg_name;
        struct list_head list;
-       struct device *dev;
 };
 
 #define OFF CLKFLAG_AUTO_OFF
@@ -61,4 +61,12 @@ struct clk {
 #define CLK_MAX CLKFLAG_MAX
 #define CLK_MINMAX (CLK_MIN | CLK_MAX)
 
+#ifdef CONFIG_DEBUG_FS
+int __init clock_debug_init(void);
+int __init clock_debug_add(struct clk *clock);
+#else
+static inline int __init clock_debug_init(void) { return 0; }
+static inline int __init clock_debug_add(struct clk *clock) { return 0; }
+#endif
+
 #endif