From: Bjorn Andersson <bjorn.andersson@linaro.org>
Date: Mon, 19 Apr 2021 15:16:46 +0000 (-0500)
Subject: Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'defconfig-for-5.13... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0109038cffefddbb05198e0f778019541eded8a1;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'defconfig-for-5.13', 'drivers-for-5.13' and 'dts-for-5.13' into for-next
---

0109038cffefddbb05198e0f778019541eded8a1
diff --cc Documentation/devicetree/bindings/firmware/qcom,scm.txt
index a884955f861ec,a884955f861ec,a884955f861ec,a884955f861ec,1edc31165d236,10281ae6e1b6b..e747d73687cbe
--- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt
+++ b/Documentation/devicetree/bindings/firmware/qcom,scm.txt
@@@@@@@ -20,7 -20,7 -20,7 -20,7 -20,8 -20,8 +20,9 @@@@@@@ Required properties
       * "qcom,scm-msm8996"
       * "qcom,scm-msm8998"
       * "qcom,scm-sc7180"
++++ + * "qcom,scm-sc7280"
       * "qcom,scm-sdm845"
+++++  * "qcom,scm-sdx55"
       * "qcom,scm-sm8150"
       * "qcom,scm-sm8250"
       * "qcom,scm-sm8350"