Merge branches 'arm64-dt-for-v4.18' and 'dt-for-v4.18' into next