ARM: SAMSUNG: Add clkdev infrastructure

The struct clk definition for Samsung platforms is extended to include
a instance of struct clk_lookup and a device name. When clocks are
registered using s3c24xx_register_clock function, the dev_id, con_id
and clk members are initialized with information from the struct clk
instance and struct clk_lookup member is registered.

Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

2 files changed, 9 insertions, 82 deletions

diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
index 772892826ffc..e30bd4591a30 100644
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@ -71,74 +71,6 @@ static int clk_null_enable(struct clk *clk, int enable)
         return 0;
 }
 
-static int dev_is_s3c_uart(struct device *dev)
-{
-        struct platform_device **pdev = s3c24xx_uart_devs;
-        int i;
-        for (i = 0; i < ARRAY_SIZE(s3c24xx_uart_devs); i++, pdev++)
-                if (*pdev && dev == &(*pdev)->dev)
-                        return 1;
-        return 0;
-}
-
-/*
- * Serial drivers call get_clock() very early, before platform bus
- * has been set up, this requires a special check to let them get
- * a proper clock
- */
-
-static int dev_is_platform_device(struct device *dev)
-{
-        return dev->bus == &platform_bus_type ||
-               (dev->bus == NULL && dev_is_s3c_uart(dev));
-}
-
-/* Clock API calls */
-
-struct clk *clk_get(struct device *dev, const char *id)
-{
-        struct clk *p;
-        struct clk *clk = ERR_PTR(-ENOENT);
-        int idno;
-
-        if (dev == NULL || !dev_is_platform_device(dev))
-                idno = -1;
-        else
-                idno = to_platform_device(dev)->id;
-
-        spin_lock(&clocks_lock);
-
-        list_for_each_entry(p, &clocks, list) {
-                if (p->id == idno &&
-                    strcmp(id, p->name) == 0 &&
-                    try_module_get(p->owner)) {
-                        clk = p;
-                        break;
-                }
-        }
-
-        /* check for the case where a device was supplied, but the
-         * clock that was being searched for is not device specific */
-
-        if (IS_ERR(clk)) {
-                list_for_each_entry(p, &clocks, list) {
-                        if (p->id == -1 && strcmp(id, p->name) == 0 &&
-                            try_module_get(p->owner)) {
-                                clk = p;
-                                break;
-                        }
-                }
-        }
-
-        spin_unlock(&clocks_lock);
-        return clk;
-}
-
-void clk_put(struct clk *clk)
-{
-        module_put(clk->owner);
-}
-
 int clk_enable(struct clk *clk)
 {
         if (IS_ERR(clk) || clk == NULL)
@@ -241,8 +173,6 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
         return ret;
 }
 
-EXPORT_SYMBOL(clk_get);
-EXPORT_SYMBOL(clk_put);
 EXPORT_SYMBOL(clk_enable);
 EXPORT_SYMBOL(clk_disable);
 EXPORT_SYMBOL(clk_get_rate);
@@ -346,14 +276,11 @@ int s3c24xx_register_clock(struct clk *clk)
         if (clk->enable == NULL)
                 clk->enable = clk_null_enable;
 
-        /* add to the list of available clocks */
-
-        /* Quick check to see if this clock has already been registered. */
-        BUG_ON(clk->list.prev != clk->list.next);
-
-        spin_lock(&clocks_lock);
-        list_add(&clk->list, &clocks);
-        spin_unlock(&clocks_lock);
+        /* fill up the clk_lookup structure and register it*/
+        clk->lookup.dev_id = clk->devname;
+        clk->lookup.con_id = clk->name;
+        clk->lookup.clk = clk;
+        clkdev_add(&clk->lookup);
 
         return 0;
 }
@@ -463,10 +390,7 @@ static int clk_debugfs_register_one(struct clk *c)
         char s[255];
         char *p = s;
 
-        p += sprintf(p, "%s", c->name);
-
-        if (c->id >= 0)
-                sprintf(p, ":%d", c->id);
+        p += sprintf(p, "%s", c->devname);
 
         d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root);
         if (!d)
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
index 983c578b8276..87d5b38a86fb 100644
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ b/arch/arm/plat-samsung/include/plat/clock.h
@@ -10,6 +10,7 @@
 */
 
 #include <linux/spinlock.h>
+#include <linux/clkdev.h>
 
 struct clk;
 
@@ -40,6 +41,7 @@ struct clk {
         struct module        *owner;
         struct clk           *parent;
         const char           *name;
+        const char              *devname;
         int                   id;
         int                   usage;
         unsigned long         rate;
@@ -47,6 +49,7 @@ struct clk {
 
         struct clk_ops          *ops;
         int                 (*enable)(struct clk *, int enable);
+        struct clk_lookup       lookup;
 #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
         struct dentry           *dent;  /* For visible tree hierarchy */
 #endif