arm64: dts: qcom: msm8996: Disable Venus by default

Disable Venus by default to allow booting without closed firmware and
enable it on the boards that didn't previously disable it. This commit
brings no functional difference.

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

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
index d4004fa..0a15589 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
@@ -1097,6 +1097,10 @@
 
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcd9335 {
        clock-names = "mclk", "slimbus";
        clocks = <&div1_mclk>,

diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
index c6d7c62..8c7a27e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
@@ -391,3 +391,7 @@
        vdda-phy-max-microamp = <18380>;
        vdda-pll-max-microamp = <9440>;
 };
+
+&venus {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 8efb1d1..6ee5453 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -1625,7 +1625,7 @@
                        power-domains = <&mmcc GPU_GDSC>;
                };
 
-               video-codec@c00000 {
+               venus: video-codec@c00000 {
                        compatible = "qcom,msm8996-venus";
                        reg = <0x00c00000 0xff000>;
                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
@@ -1656,7 +1656,7 @@
                                 <&venus_smmu 0x2d>,
                                 <&venus_smmu 0x31>;
                        memory-region = <&venus_region>;
-                       status = "okay";
+                       status = "disabled";
 
                        video-decoder {
                                compatible = "venus-decoder";