* Attach Meson64 to mainline with a bunch of patches. Tested, but need further work. * Enable DVFS on N2 which sometimes works, sometime doesn't, cleanup * Enable beta targets for Meson64 kernel family * Bump with version
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
|
|
RK3399 has a Video decoder, define the node in the dtsi. We also add
|
|
the missing power-domain in mmu node and enable the block.
|
|
|
|
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
|
|
---
|
|
Changes in v3:
|
|
* None
|
|
---
|
|
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 e62ea0e2b657..8be6e1b9e17b 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
@@ -1277,8 +1277,20 @@
|
|
interrupt-names = "vdec_mmu";
|
|
clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>;
|
|
clock-names = "aclk", "iface";
|
|
+ power-domains = <&power RK3399_PD_VDU>;
|
|
#iommu-cells = <0>;
|
|
- status = "disabled";
|
|
+ };
|
|
+
|
|
+ vdec: video-codec@ff660000 {
|
|
+ compatible = "rockchip,rk3399-vdec";
|
|
+ reg = <0x0 0xff660000 0x0 0x400>;
|
|
+ interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>;
|
|
+ interrupt-names = "vdpu";
|
|
+ clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>,
|
|
+ <&cru SCLK_VDU_CA>, <&cru SCLK_VDU_CORE>;
|
|
+ clock-names = "aclk", "iface", "cabac", "core";
|
|
+ power-domains = <&power RK3399_PD_VDU>;
|
|
+ iommus = <&vdec_mmu>;
|
|
};
|
|
|
|
iep_mmu: iommu@ff670800 {
|