Merge branch 'clk-phase' into clk-fixes

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

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);