Merge branch 'for-4.7/clk' into for-4.7/phy