arm64: dts: qcom: msm8916: Disable venus by default

Venus needs firmware that is usually signed with a device-specific key.
There are also devices that might not need it (especially during
bring-up), so let's follow more recent SoCs and disable it by default.

Enable it explicitly for all current devices except msm8916-mtp. That
one has just UART enabled currently so it cannot really benefit from
Venus.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://lore.kernel.org/r/20230911-msm8916-rmem-v1-1-b7089ec3e3a1@gerhold.net
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index c4ba29a81de9109ef9ada750c3a5b00a7efc12fc..ccbafde16d1fbb0beffd047d56c6ab498bdc9399 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -362,6 +362,10 @@
        extcon = <&usb_id>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
        firmware-name = "qcom/apq8016/wcnss.mbn";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index 84723c9b73b4ae7f8a6392d52b4af85f59917c33..1d1af1260938dc7796ee580d7029e8b10538cc98 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -155,6 +155,10 @@
        extcon = <&usb_id>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 47da738661bf8650a51131dbb569dfacd58aa910..e130f19fdccfee1f130bd9f783439ffc072a2ff3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -192,6 +192,10 @@
        extcon = <&usb_id>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index 92f695481769216eae316d4fa4ba3d4457020fed..6f38e765ed3c6953cf0dd97f8585789478250d9a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -160,6 +160,10 @@
        extcon = <&usb_id>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
index 4aeeee24cedca13af3dee3b4aaa4dfa38bd164ce..1d11139586256c4ba891a7f63dbd77594615bde2 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
@@ -150,6 +150,10 @@
        extcon = <&usb_id>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 484e488a5eca30b12a736cdd0b1526d32a3eafc1..c46df67b4d106edacabe0a50cd691c71bb986c55 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -328,6 +328,10 @@
        extcon = <&usb_id>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index 3892ad4f639a8f8dc71c89c706c89dff0aa94462..a0bb8de54fb66ec4f85078d89eab7e5cd38f42c3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -259,6 +259,10 @@
        extcon = <&pm8916_usbin>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index d73294af1a068b70886dcb3988317767f83de3d1..919677969b3eed578808010eac6180b9fe8dc351 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -146,6 +146,10 @@
        extcon = <&usb_id>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 019bf73178fa603db76f58c3a7e63c4f55f1f762..5f78004a24bd16e776560e1d71ef0c1b9d2fbdce 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -284,6 +284,10 @@
        extcon = <&muic>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio115";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index 54d648972d35db7f536fe49371af6492761f0626..06602db25e5f494b90c6e9bf721c29f3f1157767 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -158,6 +158,10 @@
        extcon = <&pm8916_usbin>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
index 68e22873647fc751a33a9b42a163d1cc07c1cbc1..c18d234fb9fe26dde992e90613905f358917a045 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
@@ -163,6 +163,10 @@
        extcon = <&muic>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index eaf87737893726c3e03f8e5801187aeac8e9259c..286ba7bb2b5a08bb001ae6d068a246d1863dbe45 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -359,6 +359,10 @@
        extcon = <&muic>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
index 004a129a2ee2b1f1e7d04f46715b5799e5d8aae6..c759c0544dd977d30544a100ac194c67fb22ac46 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
@@ -115,6 +115,10 @@
        extcon = <&pm8916_usbin>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 8e238976ab1cefc9d5929ed31a05e41cffb723fa..82ed50610b24bf15886c4a0332cf2c5dcab93065 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -189,6 +189,10 @@
        extcon = <&usb_id>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 3c934363368c32f6e88476b6ed43a8354057f579..8d63593e9252a22cdee8c0be4cc6a092ff8ef255 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1797,7 +1797,7 @@
                        clock-names = "core", "iface", "bus";
                        iommus = <&apps_iommu 5>;
                        memory-region = <&venus_mem>;
-                       status = "okay";
+                       status = "disabled";
 
                        video-decoder {
                                compatible = "venus-decoder";