1 files changed, 8 insertions, 140 deletions

diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c
index 2069bfaa3a26..8c2b4dd4a877 100644
--- a/arch/arm/mach-msm/clock.c
+++ b/arch/arm/mach-msm/clock.c
@@ -15,33 +15,19 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
 #include <linux/list.h>
 #include <linux/err.h>
-#include <linux/clk.h>
 #include <linux/spinlock.h>
-#include <linux/debugfs.h>
-#include <linux/ctype.h>
 #include <linux/pm_qos_params.h>
-#include <mach/clk.h>
 
 #include "clock.h"
 #include "proc_comm.h"
 #include "clock-7x30.h"
+#include "clock-pcom.h"
 
 static DEFINE_MUTEX(clocks_mutex);
 static DEFINE_SPINLOCK(clocks_lock);
 static LIST_HEAD(clocks);
-struct clk *msm_clocks;
-unsigned msm_num_clocks;
-
-/*
- * Bitmap of enabled clocks, excluding ACPU which is always
- * enabled
- */
-static DECLARE_BITMAP(clock_map_enabled, NR_CLKS);
-static DEFINE_SPINLOCK(clock_map_lock);
 
 /*
  * Standard clock functions defined in include/linux/clk.h
@@ -77,12 +63,8 @@ int clk_enable(struct clk *clk)
         unsigned long flags;
         spin_lock_irqsave(&clocks_lock, flags);
         clk->count++;
-        if (clk->count == 1) {
+        if (clk->count == 1)
                 clk->ops->enable(clk->id);
-                spin_lock(&clock_map_lock);
-                clock_map_enabled[BIT_WORD(clk->id)] |= BIT_MASK(clk->id);
-                spin_unlock(&clock_map_lock);
-        }
         spin_unlock_irqrestore(&clocks_lock, flags);
         return 0;
 }
@@ -94,12 +76,8 @@ void clk_disable(struct clk *clk)
         spin_lock_irqsave(&clocks_lock, flags);
         BUG_ON(clk->count == 0);
         clk->count--;
-        if (clk->count == 0) {
+        if (clk->count == 0)
                 clk->ops->disable(clk->id);
-                spin_lock(&clock_map_lock);
-                clock_map_enabled[BIT_WORD(clk->id)] &= ~BIT_MASK(clk->id);
-                spin_unlock(&clock_map_lock);
-        }
         spin_unlock_irqrestore(&clocks_lock, flags);
 }
 EXPORT_SYMBOL(clk_disable);
@@ -196,13 +174,10 @@ void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks)
 {
         unsigned n;
 
-        spin_lock_init(&clocks_lock);
         mutex_lock(&clocks_mutex);
-        msm_clocks = clock_tbl;
-        msm_num_clocks = num_clocks;
-        for (n = 0; n < msm_num_clocks; n++) {
-                set_clock_ops(&msm_clocks[n]);
-                list_add_tail(&msm_clocks[n].list, &clocks);
+        for (n = 0; n < num_clocks; n++) {
+                set_clock_ops(&clock_tbl[n]);
+                list_add_tail(&clock_tbl[n].list, &clocks);
         }
         mutex_unlock(&clocks_mutex);
 
@@ -211,115 +186,6 @@ void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks)
 
 }
 
-#if defined(CONFIG_DEBUG_FS)
-static struct clk *msm_clock_get_nth(unsigned index)
-{
-        if (index < msm_num_clocks)
-                return msm_clocks + index;
-        else
-                return 0;
-}
-
-static int clock_debug_rate_set(void *data, u64 val)
-{
-        struct clk *clock = data;
-        int ret;
-
-        /* Only increases to max rate will succeed, but that's actually good
-         * for debugging purposes. So we don't check for error. */
-        if (clock->flags & CLK_MAX)
-                clk_set_max_rate(clock, val);
-        if (clock->flags & CLK_MIN)
-                ret = clk_set_min_rate(clock, val);
-        else
-                ret = clk_set_rate(clock, val);
-        if (ret != 0)
-                printk(KERN_ERR "clk_set%s_rate failed (%d)\n",
-                        (clock->flags & CLK_MIN) ? "_min" : "", ret);
-        return ret;
-}
-
-static int clock_debug_rate_get(void *data, u64 *val)
-{
-        struct clk *clock = data;
-        *val = clk_get_rate(clock);
-        return 0;
-}
-
-static int clock_debug_enable_set(void *data, u64 val)
-{
-        struct clk *clock = data;
-        int rc = 0;
-
-        if (val)
-                rc = clock->ops->enable(clock->id);
-        else
-                clock->ops->disable(clock->id);
-
-        return rc;
-}
-
-static int clock_debug_enable_get(void *data, u64 *val)
-{
-        struct clk *clock = data;
-
-        *val = clock->ops->is_enabled(clock->id);
-
-        return 0;
-}
-
-static int clock_debug_local_get(void *data, u64 *val)
-{
-        struct clk *clock = data;
-
-        *val = clock->ops != &clk_ops_pcom;
-
-        return 0;
-}
-
-DEFINE_SIMPLE_ATTRIBUTE(clock_rate_fops, clock_debug_rate_get,
-                        clock_debug_rate_set, "%llu\n");
-DEFINE_SIMPLE_ATTRIBUTE(clock_enable_fops, clock_debug_enable_get,
-                        clock_debug_enable_set, "%llu\n");
-DEFINE_SIMPLE_ATTRIBUTE(clock_local_fops, clock_debug_local_get,
-                        NULL, "%llu\n");
-
-static int __init clock_debug_init(void)
-{
-        struct dentry *dent_rate, *dent_enable, *dent_local;
-        struct clk *clock;
-        unsigned n = 0;
-        char temp[50], *ptr;
-
-        dent_rate = debugfs_create_dir("clk_rate", 0);
-        if (IS_ERR(dent_rate))
-                return PTR_ERR(dent_rate);
-
-        dent_enable = debugfs_create_dir("clk_enable", 0);
-        if (IS_ERR(dent_enable))
-                return PTR_ERR(dent_enable);
-
-        dent_local = debugfs_create_dir("clk_local", NULL);
-        if (IS_ERR(dent_local))
-                return PTR_ERR(dent_local);
-
-        while ((clock = msm_clock_get_nth(n++)) != 0) {
-                strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1);
-                for (ptr = temp; *ptr; ptr++)
-                        *ptr = tolower(*ptr);
-                debugfs_create_file(temp, 0644, dent_rate,
-                                    clock, &clock_rate_fops);
-                debugfs_create_file(temp, 0644, dent_enable,
-                                    clock, &clock_enable_fops);
-                debugfs_create_file(temp, S_IRUGO, dent_local,
-                                    clock, &clock_local_fops);
-        }
-        return 0;
-}
-
-device_initcall(clock_debug_init);
-#endif
-
 /* The bootloader and/or AMSS may have left various clocks enabled.
  * Disable any clocks that belong to us (CLKFLAG_AUTO_OFF) but have
  * not been explicitly enabled by a clk_enable() call.
@@ -330,8 +196,10 @@ static int __init clock_late_init(void)
         struct clk *clk;
         unsigned count = 0;
 
+        clock_debug_init();
         mutex_lock(&clocks_mutex);
         list_for_each_entry(clk, &clocks, list) {
+                clock_debug_add(clk);
                 if (clk->flags & CLKFLAG_AUTO_OFF) {
                         spin_lock_irqsave(&clocks_lock, flags);
                         if (!clk->count) {