Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / rk3036.dtsi

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 33019d2..ffa9bc7 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -117,6 +117,27 @@
                status = "disabled";
        };
 
+       vpu: video-codec@10108000 {
+               compatible = "rockchip,rk3036-vpu";
+               reg = <0x10108000 0x800>;
+               interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "vdpu";
+               clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+               clock-names = "aclk", "hclk";
+               iommus = <&vpu_mmu>;
+               power-domains = <&power RK3036_PD_VPU>;
+       };
+
+       vpu_mmu: iommu@10108800 {
+               compatible = "rockchip,iommu";
+               reg = <0x10108800 0x100>;
+               interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+               clock-names = "aclk", "iface";
+               power-domains = <&power RK3036_PD_VPU>;
+               #iommu-cells = <0>;
+       };
+
        vop: vop@10118000 {
                compatible = "rockchip,rk3036-vop";
                reg = <0x10118000 0x19c>;