Skip to contentSkip to conversation

arm64: dts: rockchip: add VPU device node for RK3399

PATCH Superseded Ezequiel Garcia 2 participants 2 messages Nov 21, 2018 – Nov 22, 2018 1 message not in the archive

Subsystems (3)
Device tree bindings Media (V4L/DVB) Arm Rockchip

v10 of 11 Superseded Latest is v11 →

lore
Share & tools
lore

Ezequiel Garcia

author
#0 lore raw

PATCH v10 3/4 arm64: dts: rockchip: add VPU device node for RK3399

Add the Video Processing Unit node for the RK3399 SoC.

Also, fix the VPU IOMMU node, which was disabled and lacking its power domain property.

Signed-off-by Ezequiel Garcia <ezequiel-ZGY8ohtN/[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +13 -1
index 99e7f65c1779..040d3080565f 100644
@@ -1226,6 +1226,18 @@
 		status = "disabled";
 	};
 
+	vpu: video-codec@ff650000 {
+		compatible = "rockchip,rk3399-vpu";
+		reg = <0x0 0xff650000 0x0 0x800>;
+		interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>,
+			     <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH 0>;
+		interrupt-names = "vepu", "vdpu";
+		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+		clock-names = "aclk", "hclk";
+		power-domains = <&power RK3399_PD_VCODEC>;
+		iommus = <&vpu_mmu>;
+	};
+
 	vpu_mmu: iommu@ff650800 {
 		compatible = "rockchip,iommu";
 		reg = <0x0 0xff650800 0x0 0x40>;

@@ -1233,8 +1245,8 @@
 		interrupt-names = "vpu_mmu";
 		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
 		clock-names = "aclk", "iface";
+		power-domains = <&power RK3399_PD_VCODEC>;
 		#iommu-cells = <0>;
-		status = "disabled";
 	};
 
 	vdec_mmu: iommu@ff660480 {
Signature · 1 line
2.19.1

A message that is not in the archive (sent off-list or not yet received): 20181121195846.23676-1-ezequiel-ZGY8ohtN/[email protected]

Reviewed-by
#2 lore raw
Quoted 35 lines · Ezequiel Garcia

Add the Video Processing Unit node for the RK3399 SoC.

Also, fix the VPU IOMMU node, which was disabled and lacking its power domain property.

Signed-off-by Ezequiel Garcia <ezequiel-ZGY8ohtN/[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +12 -0
index 99e7f65c1779..040d3080565f 100644
@@ -1226,6 +1226,18 @@
                status = "disabled";
        };
 
+       vpu: video-codec@ff650000 {
+               compatible = "rockchip,rk3399-vpu";
+               reg = <0x0 0xff650000 0x0 0x800>;
+               interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>,
+                            <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH 0>;
+               interrupt-names = "vepu", "vdpu";
+               clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+               clock-names = "aclk", "hclk";
+               power-domains = <&power RK3399_PD_VCODEC>;
+               iommus = <&vpu_mmu>;
+       };
+
        vpu_mmu: iommu@ff650800 {
                compatible = "rockchip,iommu";
                reg = <0x0 0xff650800 0x0 0x40>;

arch/arm64/boot/dts/rockchip/rk3399.dtsi line 1252

Quoted 9 lines
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
@@ -1233,8 +1245,8 @@
                interrupt-names = "vpu_mmu";
                clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
                clock-names = "aclk", "iface";
+               power-domains = <&power RK3399_PD_VCODEC>;
                #iommu-cells = <0>;
-               status = "disabled";
        };
 
        vdec_mmu: iommu@ff660480 {
Reviewed-by Tomasz Figa <[email protected]>

Best regards,
Tomasz