arm64: dts: qcom: sm8250: Disable Adreno and Venus 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.

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

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index 5f41de20aa22d6294017abf48686b08a236e9c13..a5b742325261ad850a78ce5e31676ae1875347ed 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -552,7 +552,13 @@
        vdds-supply = <&vreg_l5a_0p88>;
 };
 
+&gmu {
+       status = "okay";
+};
+
 &gpu {
+       status = "okay";
+
        zap-shader {
                memory-region = <&gpu_mem>;
                firmware-name = "qcom/sm8250/a650_zap.mbn";
@@ -1352,6 +1358,10 @@
        qcom,dmic-sample-rate = <600000>;
 };
 
+&venus {
+       status = "okay";
+};
+
 /* PINCTRL - additions to nodes defined in sm8250.dtsi */
 &qup_spi0_cs_gpio {
        drive-strength = <6>;

diff --git a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
index c3a2c5aa6fe9c8e637eddec2acbb98d6674f9f89..397359ee2f8538a193152b080f95f3388a0be475 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
@@ -365,6 +365,14 @@
        };
 };
 
+&gmu {
+       status = "okay";
+};
+
+&gpu {
+       status = "okay";
+};
+
 &qupv3_id_1 {
        status = "okay";
 };
@@ -452,3 +460,7 @@
 &usb_2_dwc3 {
        dr_mode = "host";
 };
+
+&venus {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index cfc4d1febe0f9fcc34697c98e134411088e24f4e..062b944be91d87c06f2b13a36ab78162e475ccc7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -465,7 +465,13 @@
        firmware-name = "qcom/sm8250/cdsp.mbn";
 };
 
+&gmu {
+       status = "okay";
+};
+
 &gpu {
+       status = "okay";
+
        zap-shader {
                memory-region = <&gpu_mem>;
                firmware-name = "qcom/sm8250/a650_zap.mbn";
@@ -691,3 +697,7 @@
        vdda-phy-supply = <&vreg_l9a_1p2>;
        vdda-pll-supply = <&vreg_l18a_0p9>;
 };
+
+&venus {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 12217b3ce6b65dcacce2a7e9d1b898e09808bf10..995e93d3b78a7fc765b84fffd57758a1121cd243 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -1810,6 +1810,8 @@
 
                        qcom,gmu = <&gmu>;
 
+                       status = "disabled";
+
                        zap-shader {
                                memory-region = <&gpu_mem>;
                        };
@@ -1883,6 +1885,8 @@
 
                        operating-points-v2 = <&gmu_opp_table>;
 
+                       status = "disabled";
+
                        gmu_opp_table: opp-table {
                                compatible = "operating-points-v2";
 
@@ -2387,6 +2391,8 @@
                                 <&videocc VIDEO_CC_MVS0C_CLK_ARES>;
                        reset-names = "bus", "core";
 
+                       status = "disabled";
+
                        video-decoder {
                                compatible = "venus-decoder";
                        };