shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: move vpu/rkvdec to rk3399.dtsi

Browse Source 
Right now only one driver support vpu and rkvdec,
so move the nodes from rk3399-android[-next].dtsi to rk3399.dtsi.

Change-Id: Id908843774ed8eede3aeddb24059ae92a35e5b98
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
This commit is contained in:
Huang, Tao
2016-12-21 19:04:57 +08:00
committed by Jianqun Xu
parent 38ae16b5cb
commit f632877d6f
1 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
arch/arm64/boot/dts/rockchip/rk3399.dtsi
View File

@@ -1291,6 +1291,27 @@
status = "disabled";
};
vpu: vpu_service@ff650000 {
compatible = "rockchip,vpu_service";
rockchip,grf = <&grf>;
iommus = <&vpu_mmu>;
iommu_enabled = <1>;
reg = <0x0 0xff650000 0x0 0x800>;
interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH 0>,
<GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>;
interrupt-names = "irq_dec", "irq_enc";
clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
clock-names = "aclk_vcodec", "hclk_vcodec";
resets = <&cru SRST_H_VCODEC>, <&cru SRST_A_VCODEC>;
reset-names = "video_h", "video_a";
power-domains = <&power RK3399_PD_VCODEC>;
name = "vpu_service";
dev_mode = <0>;
/* 0 means ion, 1 means drm */
allocator = <1>;
status = "disabled";
};
vpu_mmu: iommu@ff650800 {
compatible = "rockchip,iommu";
reg = <0x0 0xff650800 0x0 0x40>;
@@ -1302,6 +1323,28 @@
status = "disabled";
};
rkvdec: rkvdec@ff660000 {
compatible = "rockchip,rkvdec";
rockchip,grf = <&grf>;
iommus = <&vdec_mmu>;
iommu_enabled = <1>;
reg = <0x0 0xff660000 0x0 0x400>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>;
interrupt-names = "irq_dec";
clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>,
<&cru SCLK_VDU_CA>, <&cru SCLK_VDU_CORE>;
clock-names = "aclk_vcodec", "hclk_vcodec",
"clk_cabac", "clk_core";
resets = <&cru SRST_H_VDU>, <&cru SRST_A_VDU>;
reset-names = "video_h", "video_a";
power-domains = <&power RK3399_PD_VDU>;
dev_mode = <2>;
name = "rkvdec";
/* 0 means ion, 1 means drm */
allocator = <1>;
status = "disabled";
};
vdec_mmu: iommu@ff660480 {
compatible = "rockchip,iommu";
reg = <0x0 0xff660480 0x0 0x40>, <0x0 0xff6604c0 0x0 0x40>;