1 files changed, 18 insertions, 96 deletions

diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
index 772892826ff..3b4451979d1 100644
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@ -64,79 +64,22 @@ static LIST_HEAD(clocks);
  */
 DEFINE_SPINLOCK(clocks_lock);
 
-/* enable and disable calls for use with the clk struct */
-
-static int clk_null_enable(struct clk *clk, int enable)
+/* Global watchdog clock used by arch_wtd_reset() callback */
+struct clk *s3c2410_wdtclk;
+static int __init s3c_wdt_reset_init(void)
 {
+        s3c2410_wdtclk = clk_get(NULL, "watchdog");
+        if (IS_ERR(s3c2410_wdtclk))
+                printk(KERN_WARNING "%s: warning: cannot get watchdog clock\n", __func__);
         return 0;
 }
+arch_initcall(s3c_wdt_reset_init);
 
-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;
-}
+/* enable and disable calls for use with the clk struct */
 
-void clk_put(struct clk *clk)
+static int clk_null_enable(struct clk *clk, int enable)
 {
-        module_put(clk->owner);
+        return 0;
 }
 
 int clk_enable(struct clk *clk)
@@ -241,8 +184,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);
@@ -265,7 +206,6 @@ struct clk_ops clk_ops_def_setrate = {
 
 struct clk clk_xtal = {
         .name           = "xtal",
-        .id             = -1,
         .rate           = 0,
         .parent         = NULL,
         .ctrlbit        = 0,
@@ -273,30 +213,25 @@ struct clk clk_xtal = {
 
 struct clk clk_ext = {
         .name           = "ext",
-        .id             = -1,
 };
 
 struct clk clk_epll = {
         .name           = "epll",
-        .id             = -1,
 };
 
 struct clk clk_mpll = {
         .name           = "mpll",
-        .id             = -1,
         .ops            = &clk_ops_def_setrate,
 };
 
 struct clk clk_upll = {
         .name           = "upll",
-        .id             = -1,
         .parent         = NULL,
         .ctrlbit        = 0,
 };
 
 struct clk clk_f = {
         .name           = "fclk",
-        .id             = -1,
         .rate           = 0,
         .parent         = &clk_mpll,
         .ctrlbit        = 0,
@@ -304,7 +239,6 @@ struct clk clk_f = {
 
 struct clk clk_h = {
         .name           = "hclk",
-        .id             = -1,
         .rate           = 0,
         .parent         = NULL,
         .ctrlbit        = 0,
@@ -313,7 +247,6 @@ struct clk clk_h = {
 
 struct clk clk_p = {
         .name           = "pclk",
-        .id             = -1,
         .rate           = 0,
         .parent         = NULL,
         .ctrlbit        = 0,
@@ -322,7 +255,6 @@ struct clk clk_p = {
 
 struct clk clk_usb_bus = {
         .name           = "usb-bus",
-        .id             = -1,
         .rate           = 0,
         .parent         = &clk_upll,
 };
@@ -330,7 +262,6 @@ struct clk clk_usb_bus = {
 
 struct clk s3c24xx_uclk = {
         .name           = "uclk",
-        .id             = -1,
 };
 
 /* initialise the clock system */
@@ -346,14 +277,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;
 }
@@ -458,15 +386,12 @@ static struct dentry *clk_debugfs_root;
 static int clk_debugfs_register_one(struct clk *c)
 {
         int err;
-        struct dentry *d, *child, *child_tmp;
+        struct dentry *d;
         struct clk *pa = c->parent;
         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)
@@ -488,10 +413,7 @@ static int clk_debugfs_register_one(struct clk *c)
         return 0;
 
 err_out:
-        d = c->dent;
-        list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child)
-                debugfs_remove(child);
-        debugfs_remove(c->dent);
+        debugfs_remove_recursive(c->dent);
         return err;
 }