Skip to contentSkip to conversation

arm64: dts: sdm845: add video nodes

PATCH Superseded Malathi Gottam 3 participants 6 messages Dec 20, 2018 – Jan 25, 2019

Subsystems (3)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 arm64: dts: sdm845: add video nodes

This adds video nodes to sdm845 based on the examples in the bindings.

---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +35 -0
index b72bdb0..ccd2b10 100644
@@ -87,6 +87,11 @@
 			reg = <0 0x86200000 0 0x2d00000>;
 			no-map;
 		};
+
+		venus_region: memory@95800000 {
+			reg = <0x0 0x95800000 0x0 0x500000>;
+			no-map;
+		};
 	};
 
 	cpus {
@@ -1403,5 +1408,35 @@
 				status = "disabled";
 			};
 		};
+
+		video-codec@aa00000 {
+			compatible = "qcom,sdm845-venus";
+			reg = <0x0aa00000 0xff000>;
+			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+			power-domains = <&videocc VENUS_GDSC>;
+			clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
+				 <&videocc VIDEO_CC_VENUS_AHB_CLK>,
+				 <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
+			clock-names = "core", "iface", "bus";
+			iommus = <&apps_smmu 0x10a0 0x8>,
+				 <&apps_smmu 0x10b0 0x0>;
+			memory-region = <&venus_region>;
+
+			video-core0 {
+				compatible = "venus-decoder";
+				clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
+					 <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
+				clock-names = "core", "bus";
+				power-domains = <&videocc VCODEC0_GDSC>;
+			};
+
+			video-core1 {
+				compatible = "venus-encoder";
+				clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
+					 <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
+				clock-names = "core", "bus";
+				power-domains = <&videocc VCODEC1_GDSC>;
+			};
+		};
 	};
 };
Signature · 1 line
1.9.1
Reviewed-by on v3 1/1
#1 lore raw

Hi Malathi,

Quoted 7 lines · Malathi Gottam

This adds video nodes to sdm845 based on the examples in the bindings.

---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Looks good to me:

Quoted 54 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +35 -0
index b72bdb0..ccd2b10 100644
@@ -87,6 +87,11 @@
 			reg = <0 0x86200000 0 0x2d00000>;
 			no-map;
 		};
+
+		venus_region: memory@95800000 {
+			reg = <0x0 0x95800000 0x0 0x500000>;
+			no-map;
+		};
 	};
 
 	cpus {
@@ -1403,5 +1408,35 @@
 				status = "disabled";
 			};
 		};
+
+		video-codec@aa00000 {
+			compatible = "qcom,sdm845-venus";
+			reg = <0x0aa00000 0xff000>;
+			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+			power-domains = <&videocc VENUS_GDSC>;
+			clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
+				 <&videocc VIDEO_CC_VENUS_AHB_CLK>,
+				 <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
+			clock-names = "core", "iface", "bus";
+			iommus = <&apps_smmu 0x10a0 0x8>,
+				 <&apps_smmu 0x10b0 0x0>;
+			memory-region = <&venus_region>;
+
+			video-core0 {
+				compatible = "venus-decoder";
+				clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
+					 <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
+				clock-names = "core", "bus";
+				power-domains = <&videocc VCODEC0_GDSC>;
+			};
+
+			video-core1 {
+				compatible = "venus-encoder";
+				clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
+					 <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
+				clock-names = "core", "bus";
+				power-domains = <&videocc VCODEC1_GDSC>;
+			};
+		};
 	};
 };
Signature · 2 lines
regards,
Stan
#2 lore raw
Quoted 59 lines · Stanimir Varbanov

Hi Malathi,

Quoted 7 lines · Malathi Gottam

This adds video nodes to sdm845 based on the examples in the bindings.

---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Looks good to me:

Quoted 43 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +27 -0
index b72bdb0..ccd2b10 100644
@@ -87,6 +87,11 @@
                      reg = <0 0x86200000 0 0x2d00000>;
                      no-map;
              };
+
+             venus_region: memory@95800000 {
+                     reg = <0x0 0x95800000 0x0 0x500000>;
+                     no-map;
+             };
      };
 
      cpus {
@@ -1403,5 +1408,35 @@
                              status = "disabled";
                      };
              };
+
+             video-codec@aa00000 {
+                     compatible = "qcom,sdm845-venus";
+                     reg = <0x0aa00000 0xff000>;
+                     interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                     power-domains = <&videocc VENUS_GDSC>;
+                     clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
+                              <&videocc VIDEO_CC_VENUS_AHB_CLK>,
+                              <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
+                     clock-names = "core", "iface", "bus";
+                     iommus = <&apps_smmu 0x10a0 0x8>,
+                              <&apps_smmu 0x10b0 0x0>;
+                     memory-region = <&venus_region>;
+
+                     video-core0 {
+                             compatible = "venus-decoder";
+                             clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
+                                      <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
+                             clock-names = "core", "bus";
+                             power-domains = <&videocc VCODEC0_GDSC>;
+                     };
+
Quoted 8 lines

arch/arm64/boot/dts/qcom/sdm845.dtsi line 1440

Quoted 8 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +8 -0
+                     video-core1 {
+                             compatible = "venus-encoder";
+                             clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
+                                      <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
+                             clock-names = "core", "bus";
+                             power-domains = <&videocc VCODEC1_GDSC>;
+                     };
+             };

This patch lacks the video-firmware node, it should at the very least be added before this gets merged.

#3 lore raw
Quoted 64 lines · Alexandre Courbot
Quoted 62 lines · Stanimir Varbanov

Hi Malathi,

Quoted 7 lines · Malathi Gottam

This adds video nodes to sdm845 based on the examples in the bindings.

---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Looks good to me:

Quoted 46 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +30 -0
index b72bdb0..ccd2b10 100644
@@ -87,6 +87,11 @@
                      reg = <0 0x86200000 0 0x2d00000>;
                      no-map;
              };
+
+             venus_region: memory@95800000 {
+                     reg = <0x0 0x95800000 0x0 0x500000>;
+                     no-map;
+             };
      };
 
      cpus {
@@ -1403,5 +1408,35 @@
                              status = "disabled";
                      };
              };
+
+             video-codec@aa00000 {
+                     compatible = "qcom,sdm845-venus";
+                     reg = <0x0aa00000 0xff000>;
+                     interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                     power-domains = <&videocc VENUS_GDSC>;
+                     clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
+                              <&videocc VIDEO_CC_VENUS_AHB_CLK>,
+                              <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
+                     clock-names = "core", "iface", "bus";
+                     iommus = <&apps_smmu 0x10a0 0x8>,
+                              <&apps_smmu 0x10b0 0x0>;
+                     memory-region = <&venus_region>;
+
+                     video-core0 {
+                             compatible = "venus-decoder";
+                             clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
+                                      <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
+                             clock-names = "core", "bus";
+                             power-domains = <&videocc VCODEC0_GDSC>;
+                     };
+
+                     video-core1 {
+                             compatible = "venus-encoder";
+                             clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
Quoted 8 lines
Quoted 5 lines

arch/arm64/boot/dts/qcom/sdm845.dtsi line 1440

Quoted 5 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +5 -0
+                                      <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
+                             clock-names = "core", "bus";
+                             power-domains = <&videocc VCODEC1_GDSC>;
+                     };
+             };

This patch lacks the video-firmware node, it should at the very least be added before this gets merged.

Yes Alex, I missed adding video-firmware node. Thanks for noticing. Will add it and post new version.

Thanks,
Malathi.

#4 lore raw
In reply to Alexandre Courbot

Hi Alex,

Quoted 64 lines · Alexandre Courbot
Quoted 62 lines · Stanimir Varbanov

Hi Malathi,

Quoted 7 lines · Malathi Gottam

This adds video nodes to sdm845 based on the examples in the bindings.

---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Looks good to me:

Quoted 46 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +30 -0
index b72bdb0..ccd2b10 100644
@@ -87,6 +87,11 @@
                      reg = <0 0x86200000 0 0x2d00000>;
                      no-map;
              };
+
+             venus_region: memory@95800000 {
+                     reg = <0x0 0x95800000 0x0 0x500000>;
+                     no-map;
+             };
      };
 
      cpus {
@@ -1403,5 +1408,35 @@
                              status = "disabled";
                      };
              };
+
+             video-codec@aa00000 {
+                     compatible = "qcom,sdm845-venus";
+                     reg = <0x0aa00000 0xff000>;
+                     interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                     power-domains = <&videocc VENUS_GDSC>;
+                     clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
+                              <&videocc VIDEO_CC_VENUS_AHB_CLK>,
+                              <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
+                     clock-names = "core", "iface", "bus";
+                     iommus = <&apps_smmu 0x10a0 0x8>,
+                              <&apps_smmu 0x10b0 0x0>;
+                     memory-region = <&venus_region>;
+
+                     video-core0 {
+                             compatible = "venus-decoder";
+                             clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
+                                      <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
+                             clock-names = "core", "bus";
+                             power-domains = <&videocc VCODEC0_GDSC>;
+                     };
+
+                     video-core1 {
+                             compatible = "venus-encoder";
+                             clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
Quoted 8 lines
Quoted 5 lines

arch/arm64/boot/dts/qcom/sdm845.dtsi line 1440

Quoted 5 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +5 -0
+                                      <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
+                             clock-names = "core", "bus";
+                             power-domains = <&videocc VCODEC1_GDSC>;
+                     };
+             };

This patch lacks the video-firmware node, it should at the very least be added before this gets merged.

The firmware node should be added in board dts file, the for example sdm845-mtp will not populate firmware node because it uses TZ for firmware loading.

Signature · 2 lines
regards,
Stan
#5 lore raw
Quoted 77 lines · Stanimir Varbanov

Hi Alex,

Quoted 64 lines · Alexandre Courbot
Quoted 62 lines · Stanimir Varbanov

Hi Malathi,

Quoted 7 lines · Malathi Gottam

This adds video nodes to sdm845 based on the examples in the bindings.

---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Looks good to me:

Quoted 46 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +30 -0
index b72bdb0..ccd2b10 100644
@@ -87,6 +87,11 @@
                      reg = <0 0x86200000 0 0x2d00000>;
                      no-map;
              };
+
+             venus_region: memory@95800000 {
+                     reg = <0x0 0x95800000 0x0 0x500000>;
+                     no-map;
+             };
      };
 
      cpus {
@@ -1403,5 +1408,35 @@
                              status = "disabled";
                      };
              };
+
+             video-codec@aa00000 {
+                     compatible = "qcom,sdm845-venus";
+                     reg = <0x0aa00000 0xff000>;
+                     interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                     power-domains = <&videocc VENUS_GDSC>;
+                     clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
+                              <&videocc VIDEO_CC_VENUS_AHB_CLK>,
+                              <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
+                     clock-names = "core", "iface", "bus";
+                     iommus = <&apps_smmu 0x10a0 0x8>,
+                              <&apps_smmu 0x10b0 0x0>;
+                     memory-region = <&venus_region>;
+
+                     video-core0 {
+                             compatible = "venus-decoder";
+                             clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
+                                      <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
+                             clock-names = "core", "bus";
+                             power-domains = <&videocc VCODEC0_GDSC>;
+                     };
+
+                     video-core1 {
+                             compatible = "venus-encoder";
+                             clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
Quoted 8 lines
Quoted 5 lines

arch/arm64/boot/dts/qcom/sdm845.dtsi line 1440

Quoted 5 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +5 -0
+                                      <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
+                             clock-names = "core", "bus";
+                             power-domains = <&videocc VCODEC1_GDSC>;
+                     };
+             };

This patch lacks the video-firmware node, it should at the very least be added before this gets merged.

Quoted 3 lines

The firmware node should be added in board dts file, the for example sdm845-mtp will not populate firmware node because it uses TZ for firmware loading.

Ah, that's a good point. In that case the previous patch was alright, sorry Malathi!