Commit 82066cdb authored by Luca Weiss's avatar Luca Weiss Committed by Bjorn Andersson

arm64: dts: qcom: sc7280: Move video-firmware to chrome-common

If the video-firmware node is present, the venus driver assumes we're on
a system that doesn't use TZ for starting venus, like on ChromeOS
devices.

Move the video-firmware node to chrome-common.dtsi so we can use venus
on a non-ChromeOS devices. We also need to move the secure SID 0x2184
for iommu since (on some boards) we cannot touch that.

At the same time also disable the venus node by default in the dtsi,
like it's done on other SoCs.
Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarLuca Weiss <luca.weiss@fairphone.com>
Reviewed-by: default avatarVikash Garodia <quic_vgarodia@quicinc.com>
Link: https://lore.kernel.org/r/20231201-sc7280-venus-pas-v3-2-bc132dc5fc30@fairphone.comSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent e81e8676
...@@ -119,6 +119,17 @@ &scm { ...@@ -119,6 +119,17 @@ &scm {
dma-coherent; dma-coherent;
}; };
&venus {
iommus = <&apps_smmu 0x2180 0x20>,
<&apps_smmu 0x2184 0x20>;
status = "okay";
video-firmware {
iommus = <&apps_smmu 0x21a2 0x0>;
};
};
&watchdog { &watchdog {
status = "okay"; status = "okay";
}; };
......
...@@ -4099,10 +4099,11 @@ venus: video-codec@aa00000 { ...@@ -4099,10 +4099,11 @@ venus: video-codec@aa00000 {
<&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>; <&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>;
interconnect-names = "cpu-cfg", "video-mem"; interconnect-names = "cpu-cfg", "video-mem";
iommus = <&apps_smmu 0x2180 0x20>, iommus = <&apps_smmu 0x2180 0x20>;
<&apps_smmu 0x2184 0x20>;
memory-region = <&video_mem>; memory-region = <&video_mem>;
status = "disabled";
video-decoder { video-decoder {
compatible = "venus-decoder"; compatible = "venus-decoder";
}; };
...@@ -4111,10 +4112,6 @@ video-encoder { ...@@ -4111,10 +4112,6 @@ video-encoder {
compatible = "venus-encoder"; compatible = "venus-encoder";
}; };
video-firmware {
iommus = <&apps_smmu 0x21a2 0x0>;
};
venus_opp_table: opp-table { venus_opp_table: opp-table {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment