]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'defconfig-for-5.13...
authorBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 19 Apr 2021 15:16:46 +0000 (10:16 -0500)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 19 Apr 2021 15:16:46 +0000 (10:16 -0500)
1  2  3  4  5  6 
Documentation/devicetree/bindings/arm/qcom.yaml
Documentation/devicetree/bindings/firmware/qcom,scm.txt

index a884955f861ecf905c57a204be14fc78a46947d9,a884955f861ecf905c57a204be14fc78a46947d9,a884955f861ecf905c57a204be14fc78a46947d9,a884955f861ecf905c57a204be14fc78a46947d9,1edc31165d23644ead46817baba33580b254f121,10281ae6e1b6bcb54cf6f1e5b2a2c099411031fd..e747d73687cbe67099b5debba2794ba02e60c9df
@@@@@@@ -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"