Merge branch 'v7.1-armsoc/dts64' into for-next