Merge branch 'clk-s905' into clk-next