Merge branch 'samsung/soc' into next/soc2