* [PATCH v10 3/4] arm64: dts: rockchip: add VPU device node for RK3399
@ 2018-11-21 19:58 Ezequiel Garcia
2018-11-22 10:29 ` Tomasz Figa
0 siblings, 1 reply; 2+ messages in thread
From: Ezequiel Garcia @ 2018-11-21 19:58 UTC (permalink / raw)
To: linux-media, devicetree, linux-rockchip
Cc: Hans Verkuil, kernel, Nicolas Dufresne, Tomasz Figa,
Heiko Stuebner, Rob Herring, Mark Rutland, Miouyouyou,
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@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 {
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v10 3/4] arm64: dts: rockchip: add VPU device node for RK3399
2018-11-21 19:58 [PATCH v10 3/4] arm64: dts: rockchip: add VPU device node for RK3399 Ezequiel Garcia
@ 2018-11-22 10:29 ` Tomasz Figa
0 siblings, 0 replies; 2+ messages in thread
From: Tomasz Figa @ 2018-11-22 10:29 UTC (permalink / raw)
To: Ezequiel Garcia
Cc: Linux Media Mailing List, devicetree,
open list:ARM/Rockchip SoC...,
Hans Verkuil, kernel, Nicolas Dufresne, Heiko Stübner,
Rob Herring, Mark Rutland, myy
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-22 21:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-21 19:58 [PATCH v10 3/4] arm64: dts: rockchip: add VPU device node for RK3399 Ezequiel Garcia
2018-11-22 10:29 ` Tomasz Figa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).