Re: [PATCH 2/3] arm64: dts: qcom: sc7280: Move video-firmware to chrome-common

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 29/09/2023 09:38, Luca Weiss wrote:
If the video-firmware node is present, the venus driver assumes we're on
a non-TZ system. Move the video-firmware node to chrome-common.dtsi so
we can use venus on a TZ board.

At the same time let's disable the venus node by default as is custom on
such nodes.

Signed-off-by: Luca Weiss <luca.weiss@xxxxxxxxxxxxx>
---
  arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 8 ++++++++
  arch/arm64/boot/dts/qcom/sc7280.dtsi               | 6 ++----
  2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
index 5d462ae14ba1..cd491e46666d 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
@@ -104,6 +104,14 @@ &scm {
  	dma-coherent;
  };
+&venus {
+	status = "okay";
+
+	video-firmware {
+		iommus = <&apps_smmu 0x21a2 0x0>;
+	};
+};
+
  &watchdog {
  	status = "okay";
  };
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 66f1eb83cca7..fa53f54d4675 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -3740,6 +3740,8 @@ venus: video-codec@aa00000 {
  				 <&apps_smmu 0x2184 0x20>;
  			memory-region = <&video_mem>;
+ status = "disabled";
+
  			video-decoder {
  				compatible = "venus-decoder";
  			};
@@ -3748,10 +3750,6 @@ video-encoder {
  				compatible = "venus-encoder";
  			};
- video-firmware {
-				iommus = <&apps_smmu 0x21a2 0x0>;
-			};
-
  			venus_opp_table: opp-table {
  				compatible = "operating-points-v2";

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [Linux for Sparc]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux