Merge branch 'for-4.15/firmware' into for-4.15/clk