Merge branch 'clk-phase' into clk-fixes

* clk-phase: clk: update cached phase to respect the fact when setting phase

Merge branch 'clk-phase' into clk-fixes
* clk-phase: clk: update cached phase to respect the fact when setting phase
91584eb5 · Stephen Boyd · bd13c6cb · 7f95beea · 91584eb5
Commit 91584eb5 authored Mar 12, 2018 by Stephen Boyd
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

drivers/clk/clk.c drivers/clk/clk.c +4 -1

No files found.
--- 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);