Merge branch 'v6.5-armsoc/dtsfixes' into for-next