| Message ID | 20181121195846.23676-1-ezequiel@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Thu, Nov 22, 2018 at 4:58 AM Ezequiel Garcia <ezequiel@collabora.com> wrote: > > 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@collabora.com> > --- > arch/arm64/boot/dts/rockchip/rk3399.dtsi | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > index 99e7f65c1779..040d3080565f 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > @@ -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 { Reviewed-by: Tomasz Figa <tfiga@chromium.org> Best regards, Tomasz
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 99e7f65c1779..040d3080565f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -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 {
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@collabora.com> --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)