sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

clk: Keep enable count consistent over reparent 

When reparenting a clock we have to make sure the new parent is enabled
when the clock was enabled on the old parent. Also we have to decrease
the old parents use counter when the clock was enabled.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2017-02-01 15:56:35 +01:00
parent 4cb70c729f
commit c21794d0ee
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/clk/clk.c
View File

@ -173,14 +173,15 @@ struct clk *clk_lookup(const char *name)
return ERR_PTR(-ENODEV);
}
int clk_set_parent(struct clk *clk, struct clk *parent)
int clk_set_parent(struct clk *clk, struct clk *newparent)
{
int i;
int i, ret;
struct clk *curparent = clk_get_parent(clk);
if (IS_ERR(clk))
return PTR_ERR(clk);
if (IS_ERR(parent))
return PTR_ERR(parent);
if (IS_ERR(newparent))
return PTR_ERR(newparent);
if (!clk->num_parents)
return -EINVAL;
@ -192,14 +193,22 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
clk->parents[i] = clk_lookup(clk->parent_names[i]);
if (!IS_ERR_OR_NULL(clk->parents[i]))
if (clk->parents[i] == parent)
if (clk->parents[i] == newparent)
break;
}
if (i == clk->num_parents)
return -EINVAL;
return clk->ops->set_parent(clk, i);
if (clk->enable_count)
clk_enable(newparent);
ret = clk->ops->set_parent(clk, i);
if (clk->enable_count)
clk_disable(curparent);
return ret;
}
struct clk *clk_get_parent(struct clk *clk)