Skip to content

[dm][clk] fixup the work flow of CLK #11673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GuEe-GUI wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −5
Open

[dm][clk] fixup the work flow of CLK #11673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions components/drivers/clk/clk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ rt_err_t rt_clk_set_max_rate(struct rt_clk *clk, rt_ubase_t rate)
static rt_err_t clk_set_rate(struct rt_clk *clk, rt_ubase_t rate)
{
rt_err_t err;
rt_ubase_t old_rate, prate;
rt_ubase_t old_rate, prate, current_rate, rounded_rate;
rt_bool_t was_enabled = RT_FALSE;
rt_bool_t was_disabled = RT_FALSE;
struct rt_clk *parent = RT_NULL;
Expand Down Expand Up @@ -1015,7 +1015,7 @@ static rt_err_t clk_set_rate(struct rt_clk *clk, rt_ubase_t rate)

parent = clk_get_parent(clk);

if (cell->parents_nr > 1)
if (cell->parents_nr > 1 && !(cell->flags & RT_CLK_F_SET_RATE_NO_REPARENT))
{
rt_uint8_t best_idx = RT_UINT8_MAX;
rt_ubase_t best_rounded = 0, best_diff = ~0UL;
Expand All @@ -1032,7 +1032,7 @@ static rt_err_t clk_set_rate(struct rt_clk *clk, rt_ubase_t rate)

if (!parent_cell->clk && !(parent_cell->clk = clk_cell_get_clk(parent_cell)))
{
return RT_NULL;
return -RT_ENOMEM;
}

prate = clk_get_rate(parent_cell->clk);
Expand All @@ -1050,7 +1050,7 @@ static rt_err_t clk_set_rate(struct rt_clk *clk, rt_ubase_t rate)
}
}

if (best_idx != RT_UINT8_MAX && parent->cell != best_parent_cell)
if (best_idx != RT_UINT8_MAX && (!parent || parent->cell != best_parent_cell))
{
parent = best_parent_cell->clk;

Expand Down Expand Up @@ -1080,6 +1080,21 @@ static rt_err_t clk_set_rate(struct rt_clk *clk, rt_ubase_t rate)
prate = 0;
}

/*
* Re-read the rate after parent selection / parent set_rate: it may
* already match the rounded target. Skip gate toggles, notify and
* set_rate when unchanged (old_rate above is kept for notify).
*/
current_rate = clk_get_rate(clk);
rounded_rate = clk_round_rate(clk, rate);

if (rounded_rate == current_rate)
{
return RT_EOK;
}

rate = rounded_rate;

if ((cell->flags & RT_CLK_F_SET_RATE_GATE) && cell->enable_count > 0)
{
was_enabled = RT_TRUE;
Expand Down Expand Up @@ -2545,4 +2560,4 @@ static int list_clk(int argc, char**argv)
MSH_CMD_EXPORT(list_clk, dump all of clk information);
#endif /* RT_USING_CONSOLE && RT_USING_MSH */

/**@}*/
/**@}*/
Loading