Skip to content

Commit

Permalink
ARM: SAMSUNG: Do not register set_parent call if no source
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ben Dooks committed Jan 15, 2010
1 parent 1d9f13c commit 1423569
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion arch/arm/plat-samsung/clock-clksrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down

0 comments on commit 1423569

Please sign in to comment.