diff options
| author |   Stephen Boyd <sboyd@kernel.org> | 2018-03-12 15:09:03 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-03-12 15:09:03 -0700 |
| commit | 91584eb51b47213ca7e031f588e8a4da49f65ef6 (patch) | |
| tree | e87637bfc27374854a24d66ff2af90168f5eacef /drivers/clk | |
| parent | Merge tag 'ti-clk-fixes-4.16' of https://github.com/t-kristo/linux-pm into clk-fixes (diff) | |
| parent | clk: update cached phase to respect the fact when setting phase (diff) | |
| download | linux-dev-91584eb51b47213ca7e031f588e8a4da49f65ef6.tar.xz linux-dev-91584eb51b47213ca7e031f588e8a4da49f65ef6.zip | |
Merge branch 'clk-phase' into clk-fixes
* clk-phase:
clk: update cached phase to respect the fact when setting phase
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 6d54e933c901..337189971d34 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2309,8 +2309,11 @@ static int clk_core_set_phase_nolock(struct clk_core *core, int degrees) trace_clk_set_phase(core, degrees); - if (core->ops->set_phase) + if (core->ops->set_phase) { ret = core->ops->set_phase(core->hw, degrees); + if (!ret) + core->phase = degrees; + } trace_clk_set_phase_complete(core, degrees); |