ARM: SAMSUNG: Do not register set_parent call if no source

If there is no source register defined, do not register a clksrc
clock with a valid .set_parent in the ops.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c
index aaf7d5ebea96f7b1a7bc4cb37e3266a6e66cfe16..33c633a8be8dece4167e4d421713cbc82e8179fa 100644 (file)
--- a/arch/arm/plat-samsung/clock-clksrc.c
+++ b/arch/arm/plat-samsung/clock-clksrc.c
@@ -86,7 +86,7 @@ static int s3c_setparent_clksrc(struct clk *clk, struct clk *parent)
                        break;
                }
 
-       if (src_nr >= 0 && sclk->reg_src.reg) {
+       if (src_nr >= 0) {
                clk->parent = parent;
 
                clksrc &= ~mask;
@@ -162,6 +162,12 @@ static struct clk_ops clksrc_ops_nodiv = {
        .set_parent     = s3c_setparent_clksrc,
 };
 
+static struct clk_ops clksrc_ops_nosrc = {
+       .get_rate       = s3c_getrate_clksrc,
+       .set_rate       = s3c_setrate_clksrc,
+       .round_rate     = s3c_roundrate_clksrc,
+};
+
 void __init s3c_register_clksrc(struct clksrc_clk *clksrc, int size)
 {
        int ret;
@@ -174,6 +180,8 @@ void __init s3c_register_clksrc(struct clksrc_clk *clksrc, int size)
                if (!clksrc->clk.ops) {
                        if (!clksrc->reg_div.reg)
                                clksrc->clk.ops = &clksrc_ops_nodiv;
+                       else if (!clksrc->reg_src.reg)
+                               clksrc->clk.ops = &clksrc_ops_nosrc;
                        else
                                clksrc->clk.ops = &clksrc_ops;
                }