Merge branch 'arm64-fixes-for-6.1' into HEAD

Mergeback arm64-fixes-for-6.1 to avoid merge conflicts.

diff --cc arch/arm64/boot/dts/qcom/msm8996.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sa8155p-adp.dts
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sa8295p-adp.dts
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sc7280.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sc8280xp.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sm8250.dtsi
Simple merge