Merge branch 'clk-hikey' into clk-next