Merge branch 'clk-phase' into clk-fixes

* clk-phase: clk: update cached phase to respect the fact when setting phase
2018-03-12 15:09:03 -07:00 · 2018-03-12 15:09:03 -07:00 · 91584eb51b
parent bd13c6cbd3 7f95beea36
commit 91584eb51b
1 changed files with 4 additions and 1 deletions
--- 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);