arm64: dts: qcom: Use QCOM_SCM_VMID defines for qcom,vmid

Since we have those defines available in a header, let's use them
everywhere where qcom,vmid property is used.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://lore.kernel.org/r/20230818-qcom-vmid-defines-v1-1-45b610c96b13@fairphone.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
index bcd2397eb373392188bbd5a6518d1a95953ee9d7..baa7472b7a289d4fbb38f0cbcb03150c656615a7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
@@ -117,7 +117,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                /delete-node/ mba@91500000;

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index c8e0986425ab4fccfbfa1b8a55930b8fc7edc480..6ba9da9e6a8b993f912a813bf44308f235cc0dcf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -9,6 +9,7 @@
 #include <dt-bindings/clock/qcom,rpmcc.h>
 #include <dt-bindings/interconnect/qcom,msm8996.h>
 #include <dt-bindings/interconnect/qcom,msm8996-cbf.h>
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/soc/qcom,apr.h>
@@ -538,7 +539,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                mpss_mem: mpss@88800000 {

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index f180047cacb057c4bd7c5a969cebdb0ab040784f..aac23a8ef6c8e2415083d6dc8c65846c399eb217 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -6,6 +6,7 @@
 #include <dt-bindings/clock/qcom,gpucc-msm8998.h>
 #include <dt-bindings/clock/qcom,mmcc-msm8998.h>
 #include <dt-bindings/clock/qcom,rpmcc.h>
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/gpio/gpio.h>
 
@@ -56,7 +57,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                spss_mem: memory@8ab00000 {

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index dea6aea8e85c3ca1ff788e3e619b676a22211fea..be350dd9bc619eeea6af04dee41e57e1ec121444 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -11,6 +11,7 @@
 #include <dt-bindings/clock/qcom,lpasscorecc-sc7180.h>
 #include <dt-bindings/clock/qcom,rpmh.h>
 #include <dt-bindings/clock/qcom,videocc-sc7180.h>
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/interconnect/qcom,icc.h>
 #include <dt-bindings/interconnect/qcom,osm-l3.h>
 #include <dt-bindings/interconnect/qcom,sc7180.h>
@@ -688,7 +689,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 75d7ccd22eaf05932ed99acfc96488609fad7ce0..f4b5adcdb493eb97d5c0ec8ee9a99e349b050e82 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -13,6 +13,7 @@
 #include <dt-bindings/clock/qcom,rpmh.h>
 #include <dt-bindings/clock/qcom,videocc-sc7280.h>
 #include <dt-bindings/dma/qcom-gpi.h>
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interconnect/qcom,osm-l3.h>
 #include <dt-bindings/interconnect/qcom,sc7280.h>
@@ -157,7 +158,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
index abc66613ccaad31e4a94fe707c107f9b94655900..3ea07d094b607f40b1a0a5a80d776f1c097ed5a8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/gpio-keys.h>
 #include <dt-bindings/input/input.h>
@@ -130,7 +131,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                wlan_mem: wlan-region@8bc00000 {

diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
index 834e6f9fb7c825214afa91a3cd2ce1475f154d0f..fd2fab4895b39037a38ea7b1a976670522eec6ef 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/gpio-keys.h>
 #include <dt-bindings/input/input.h>
@@ -135,7 +136,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                wlan_mem: wlan-region@8bc00000 {

diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index cc6cf491f0a95c067d2bdaa618b5cf583d0ea99e..775700f78e0feb8998b36aaf3e0a28ddc739e0df 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/clock/qcom,gpucc-sdm660.h>
 #include <dt-bindings/clock/qcom,mmcc-sdm660.h>
 #include <dt-bindings/clock/qcom,rpmcc.h>
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/interconnect/qcom,sdm660.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/gpio/gpio.h>
@@ -453,7 +454,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                smem_region: smem-mem@86000000 {

diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
index f942c5afea9b51e8cd2739a97833c2f0ccf2d7b1..99dafc6716e76e25aad0755e6004dc952779689f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
@@ -111,7 +111,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                /* rmtfs upper guard */

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 122c7128dea9da3aa2d609191d2ac3b012d0c55e..b523b5fff70228061ca935cc0e90b5a82c9c595a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -90,7 +90,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
                rmtfs_upper_guard: rmtfs-upper-guard@f5d01000 {
                        no-map;

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 9d6faeb6562441381d3302cc763251fd5401cc11..93b1582e807dd808357120f3bca93cf325b7c29d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -111,7 +111,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index 6db12abaa88d17b0988ec63be162054e5623a50c..e386b504e978bff5cafd717245f51af2e121d764 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -108,7 +108,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index d4f8099d160b5990c8598d7689d6862fb01b984f..8b561564c6c9c440afea7a384167884bc3d32b25 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -814,7 +814,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                qseecom_mem: qseecom@8ab00000 {

diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
index 18171c5d8a387722ccb35364eb6138db0980946e..136e273d09a787a31687f119eef8f20a7c60b7c1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
+++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
@@ -8,6 +8,7 @@
 /* PMK8350 (in reality a PMK8003) is configured to use SID6 instead of 0 */
 #define PMK8350_SID 6
 
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h>
 #include <dt-bindings/input/input.h>
@@ -75,7 +76,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 04bbf7ce2879dde3ff0bafbdadfa294d237dcb41..ed14c5b054e20b560e50e086c3f9e92ecd5f779d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -5,6 +5,7 @@
  */
 
 #include <dt-bindings/dma/qcom-gpi.h>
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/phy/phy-qcom-qmp.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
@@ -721,7 +722,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                camera_mem: memory@8b700000 {

diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index 00604bf7724f42a855316606b4d31981b9f9342f..4989a3971c945ac4bd351bcb3b4c0a2b443b716f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -10,6 +10,7 @@
 #include <dt-bindings/clock/qcom,gpucc-sm8350.h>
 #include <dt-bindings/clock/qcom,rpmh.h>
 #include <dt-bindings/dma/qcom-gpi.h>
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interconnect/qcom,sm8350.h>
 #include <dt-bindings/mailbox/qcom-ipcc.h>
@@ -503,7 +504,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                hyp_reserved_mem: memory@d0000000 {

diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
index 001fb2723fbb7c6dd6a2f19ef00bdfb862a17bf4..8b29fcf483a334452fac69817939323db84ff48e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
@@ -80,7 +80,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                ramoops@ffc00000 {

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 2a60cf8bd891c21447cb1449e0b6924d1e5bea95..09a0c35dd514c927650cb9e23fbe893052f7adb5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -10,6 +10,7 @@
 #include <dt-bindings/clock/qcom,sm8450-dispcc.h>
 #include <dt-bindings/clock/qcom,sm8450-videocc.h>
 #include <dt-bindings/dma/qcom-gpi.h>
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/mailbox/qcom-ipcc.h>
 #include <dt-bindings/phy/phy-qcom-qmp.h>
@@ -540,7 +541,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                xbl_sc_mem2: memory@a6e00000 {

diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index 2f71928e7ab4292dd1d22d8f4560cdc24e0712be..7b9ddde0b2c9a1700fa93d95cb17346088880a93 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -11,6 +11,7 @@
 #include <dt-bindings/clock/qcom,sm8550-tcsr.h>
 #include <dt-bindings/clock/qcom,sm8550-dispcc.h>
 #include <dt-bindings/dma/qcom-gpi.h>
+#include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interconnect/qcom,sm8550-rpmh.h>
@@ -571,7 +572,7 @@
                        no-map;
 
                        qcom,client-id = <1>;
-                       qcom,vmid = <15>;
+                       qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
                };
 
                mpss_dsm_mem: mpss-dsm-region@d4d00000 {