From 33220a7bcf9bdfcc72df88e53f4cc6497bc6b8d3 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben@ben-laptop.fluff.org>
Date: Wed, 6 Jan 2010 01:07:57 +0900
Subject: [PATCH] --- yaml --- r: 187335 b: refs/heads/master c:
 fb6e76cd2309c76d2120e013ff34ff6ab27aad88 h: refs/heads/master i:   187333:
 bb02f8fe1d69cc3c2388ed7ca5a6130e9c18b5e1   187331:
 558c91384d65779b2f4944f18606cba111602858   187327:
 642df9cd5c1a3a59aa75397f3645c1d74d66244f v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/arm/plat-samsung/clock-clksrc.c | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e8c0e49ff561..16253e9e6abd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c2f69b15d5420291a941ace10149e76f0af7ab0
+refs/heads/master: fb6e76cd2309c76d2120e013ff34ff6ab27aad88
diff --git a/trunk/arch/arm/plat-samsung/clock-clksrc.c b/trunk/arch/arm/plat-samsung/clock-clksrc.c
index 12129f8e509c..aaf7d5ebea96 100644
--- a/trunk/arch/arm/plat-samsung/clock-clksrc.c
+++ b/trunk/arch/arm/plat-samsung/clock-clksrc.c
@@ -158,14 +158,25 @@ static struct clk_ops clksrc_ops = {
 	.round_rate	= s3c_roundrate_clksrc,
 };
 
+static struct clk_ops clksrc_ops_nodiv = {
+	.set_parent	= s3c_setparent_clksrc,
+};
+
 void __init s3c_register_clksrc(struct clksrc_clk *clksrc, int size)
 {
 	int ret;
 
+	WARN_ON(!clksrc->reg_div.reg && !clksrc->reg_src.reg);
+
 	for (; size > 0; size--, clksrc++) {
 		/* fill in the default functions */
-		if (!clksrc->clk.ops)
-			clksrc->clk.ops = &clksrc_ops;
+
+		if (!clksrc->clk.ops) {
+			if (!clksrc->reg_div.reg)
+				clksrc->clk.ops = &clksrc_ops_nodiv;
+			else
+				clksrc->clk.ops = &clksrc_ops;
+		}
 
 		/* setup the clocksource, but do not announce it
 		 * as it may be re-set by the setup routines