Merge branch 'clk-phase' into clk-fixes

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

diff --cc drivers/clk/clk.c
Simple merge