Merge branch 'for-5.10/soc' into for-5.10/firmware