arm64: dts: qcom: sm8150: Disable Adreno and modem by default

Components that rely on proprietary (not to mention signed!) firmware should
not be enabled by default, as lack of the aforementioned firmware could cause
various issues, from random errors to straight-up failing to boot.

Not enabling modem back on the HDK, as it uses a sa8150.

Also fixed a sorting mistake in both boards' dt while at it.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Link: https://lore.kernel.org/r/20210611203301.101067-1-konrad.dybcio@somainline.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
index fb2cf3d987a1800ef54d5c83bc42fccbe437a775..50ee3bb97325ac48ab5323748d6645c615daff77 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
@@ -354,7 +354,11 @@
        };
 };
 
-&qupv3_id_1 {
+&gmu {
+       status = "okay";
+};
+
+&gpu {
        status = "okay";
 };
 
@@ -372,6 +376,10 @@
        };
 };
 
+&qupv3_id_1 {
+       status = "okay";
+};
+
 &remoteproc_adsp {
        status = "okay";
 

diff --git a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
index 3774f8e6341640a80234f535a58bd4f67cb065d1..7de54b2e497e82904abb1831bfe04348e03e1095 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
@@ -349,7 +349,11 @@
        };
 };
 
-&qupv3_id_1 {
+&gmu {
+       status = "okay";
+};
+
+&gpu {
        status = "okay";
 };
 
@@ -367,6 +371,10 @@
        };
 };
 
+&qupv3_id_1 {
+       status = "okay";
+};
+
 &remoteproc_adsp {
        status = "okay";
        firmware-name = "qcom/sm8150/adsp.mdt";

diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 142cf786c6cf163d1c2a24dccae60818206364b2..612dda0fef43852623240b2d8598b274efbe9f51 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -1152,6 +1152,8 @@
 
                        qcom,gmu = <&gmu>;
 
+                       status = "disabled";
+
                        zap-shader {
                                memory-region = <&gpu_mem>;
                        };
@@ -1219,6 +1221,8 @@
 
                        operating-points-v2 = <&gmu_opp_table>;
 
+                       status = "disabled";
+
                        gmu_opp_table: opp-table {
                                compatible = "operating-points-v2";
 
@@ -1566,6 +1570,8 @@
                        qcom,smem-states = <&modem_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
 
+                       status = "disabled";
+
                        glink-edge {
                                interrupts = <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>;
                                label = "modem";