From 2c28c881592be990c0d5ef428767bf4c11871b64 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Wed, 6 Jan 2010 01:53:25 +0900 Subject: [PATCH] --- yaml --- r: 187337 b: refs/heads/master c: 14235696d401e62f8f5740ca2fb917ab42b9fd18 h: refs/heads/master i: 187335: 33220a7bcf9bdfcc72df88e53f4cc6497bc6b8d3 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-samsung/clock-clksrc.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 12e34c822e80..2bde26a38f77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d9f13c49ed750260f40317629bdd66160a3ac16 +refs/heads/master: 14235696d401e62f8f5740ca2fb917ab42b9fd18 diff --git a/trunk/arch/arm/plat-samsung/clock-clksrc.c b/trunk/arch/arm/plat-samsung/clock-clksrc.c index aaf7d5ebea96..33c633a8be8d 100644 --- a/trunk/arch/arm/plat-samsung/clock-clksrc.c +++ b/trunk/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; }