Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[pandora-kernel.git] / arch / arm / plat-omap / include / plat / clock.h

diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h
index 474c21e..dfc472c 100644 (file)
--- a/arch/arm/plat-omap/include/plat/clock.h
+++ b/arch/arm/plat-omap/include/plat/clock.h
@@ -120,7 +120,6 @@ struct clk {
        struct list_head        node;
        const struct clkops     *ops;
        const char              *name;
-       int                     id;
        struct clk              *parent;
        struct list_head        children;
        struct list_head        sibling;        /* node for children */
@@ -183,29 +182,29 @@ unsigned long omap_fixed_divisor_recalc(struct clk *clk);
 extern void clk_init_cpufreq_table(struct cpufreq_frequency_table **table);
 extern void clk_exit_cpufreq_table(struct cpufreq_frequency_table **table);
 #endif
+extern struct clk *omap_clk_get_by_name(const char *name);
 
 extern const struct clkops clkops_null;
 
+extern struct clk dummy_ck;
+
 /* Clock flags */
-#define RATE_FIXED             (1 << 0)        /* Fixed clock rate */
-#define ENABLE_REG_32BIT       (1 << 1)        /* Use 32-bit access */
-#define CLOCK_IDLE_CONTROL     (1 << 2)
-#define CLOCK_NO_IDLE_PARENT   (1 << 3)
-#define DELAYED_APP            (1 << 4)        /* Delay application of clock */
-#define ENABLE_ON_INIT         (1 << 5)        /* Enable upon framework init */
-#define INVERT_ENABLE          (1 << 6)        /* 0 enables, 1 disables */
-#define ALWAYS_ENABLED         (1 << 7)
+#define ENABLE_REG_32BIT       (1 << 0)        /* Use 32-bit access */
+#define CLOCK_IDLE_CONTROL     (1 << 1)
+#define CLOCK_NO_IDLE_PARENT   (1 << 2)
+#define ENABLE_ON_INIT         (1 << 3)        /* Enable upon framework init */
+#define INVERT_ENABLE          (1 << 4)        /* 0 enables, 1 disables */
 
 /* Clksel_rate flags */
-#define DEFAULT_RATE           (1 << 0)
-#define RATE_IN_242X           (1 << 1)
-#define RATE_IN_243X           (1 << 2)
-#define RATE_IN_343X           (1 << 3)        /* rates common to all 343X */
-#define RATE_IN_3430ES2                (1 << 4)        /* 3430ES2 rates only */
-#define RATE_IN_36XX           (1 << 5)
-#define RATE_IN_4430           (1 << 6)
+#define RATE_IN_242X           (1 << 0)
+#define RATE_IN_243X           (1 << 1)
+#define RATE_IN_3XXX           (1 << 2)        /* rates common to all OMAP3 */
+#define RATE_IN_3430ES2                (1 << 3)        /* 3430ES2 rates only */
+#define RATE_IN_36XX           (1 << 4)
+#define RATE_IN_4430           (1 << 5)
 
 #define RATE_IN_24XX           (RATE_IN_242X | RATE_IN_243X)
 
+#define RATE_IN_3430ES2PLUS    (RATE_IN_3430ES2 | RATE_IN_36XX)
 
 #endif