[ARM] 3331/1: S3C24XX - add clk_set_parent() to clock code
authorBen Dooks <ben-linux@fluff.org>
Mon, 20 Mar 2006 17:10:04 +0000 (17:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 21 Mar 2006 22:06:03 +0000 (22:06 +0000)
Patch from Ben Dooks

Add clk_set_parent() call to clock code

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-s3c2410/clock.c
arch/arm/mach-s3c2410/clock.h

index aaada9e..773b7ae 100644 (file)
@@ -192,6 +192,23 @@ struct clk *clk_get_parent(struct clk *clk)
        return clk->parent;
 }
 
+int clk_set_parent(struct clk *clk, struct clk *parent)
+{
+       int ret = 0;
+
+       if (IS_ERR(clk))
+               return -EINVAL;
+
+       mutex_lock(&clocks_mutex);
+
+       if (clk->set_parent)
+               ret = (clk->set_parent)(clk, parent);
+
+       mutex_unlock(&clocks_mutex);
+
+       return ret;
+}
+
 EXPORT_SYMBOL(clk_get);
 EXPORT_SYMBOL(clk_put);
 EXPORT_SYMBOL(clk_enable);
@@ -200,6 +217,7 @@ EXPORT_SYMBOL(clk_get_rate);
 EXPORT_SYMBOL(clk_round_rate);
 EXPORT_SYMBOL(clk_set_rate);
 EXPORT_SYMBOL(clk_get_parent);
+EXPORT_SYMBOL(clk_set_parent);
 
 /* base clock enable */
 
index eb5c95d..c4f36f0 100644 (file)
@@ -19,7 +19,9 @@ struct clk {
        int                   usage;
        unsigned long         rate;
        unsigned long         ctrlbit;
+
        int                 (*enable)(struct clk *, int enable);
+       int                 (*set_parent)(struct clk *c, struct clk *parent);
 };
 
 /* other clocks which may be registered by board support */