Merge branch 'hisi/soc' into next/soc