dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Luca Weiss
2023-09-19 19:16:35 -07:00
committed by Bjorn Andersson
parent 454557d003
commit 018c949b32
19 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+1 -1
View File
@@ -117,7 +117,7 @@
no-map;
qcom,client-id = <1>;
qcom,vmid = <15>;
qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
};
/delete-node/ mba@91500000;
arch/arm64/boot/dts/qcom/msm8996.dtsi
+2 -1
View File
@@ -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 {
arch/arm64/boot/dts/qcom/msm8998.dtsi
+2 -1
View File
@@ -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 {
arch/arm64/boot/dts/qcom/sc7180.dtsi
+2 -1
View File
@@ -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>;
};
};
arch/arm64/boot/dts/qcom/sc7280.dtsi
+2 -1
View File
@@ -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>;
};
};
arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
+2 -1
View File
@@ -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 {
arch/arm64/boot/dts/qcom/sc8180x-primus.dts
+2 -1
View File
@@ -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 {
arch/arm64/boot/dts/qcom/sdm630.dtsi
+2 -1
View File
@@ -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 {
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+1 -1
View File
@@ -111,7 +111,7 @@
no-map;
qcom,client-id = <1>;
qcom,vmid = <15>;
qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
};
/* rmtfs upper guard */
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+1 -1
View File
@@ -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;
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+1 -1
View File
@@ -111,7 +111,7 @@
no-map;
qcom,client-id = <1>;
qcom,vmid = <15>;
qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
};
};
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+1 -1
View File
@@ -108,7 +108,7 @@
no-map;
qcom,client-id = <1>;
qcom,vmid = <15>;
qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
};
};
arch/arm64/boot/dts/qcom/sdm845.dtsi
+1 -1
View File
@@ -814,7 +814,7 @@
no-map;
qcom,client-id = <1>;
qcom,vmid = <15>;
qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
};
qseecom_mem: qseecom@8ab00000 {
arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
+2 -1
View File
@@ -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>;
};
};
arch/arm64/boot/dts/qcom/sm8150.dtsi
+2 -1
View File
@@ -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 {
arch/arm64/boot/dts/qcom/sm8350.dtsi
+2 -1
View File
@@ -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 {
arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
+1 -1
View File
@@ -80,7 +80,7 @@
no-map;
qcom,client-id = <1>;
qcom,vmid = <15>;
qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
};
ramoops@ffc00000 {
arch/arm64/boot/dts/qcom/sm8450.dtsi
+2 -1
View File
@@ -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 {
arch/arm64/boot/dts/qcom/sm8550.dtsi
+2 -1
View File
@@ -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 {