From: Ben Dooks <ben-linux@fluff.org>
Date: Tue, 5 Jan 2010 16:53:25 +0000 (+0900)
Subject: ARM: SAMSUNG: Do not register set_parent call if no source
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=14235696d401e62f8f5740ca2fb917ab42b9fd18;p=deliverable%2Flinux.git

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 aaf7d5ebea96..33c633a8be8d 100644
--- 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;
 		}