Skip to content

Commit 11c8364

Browse files
liuyx1314rkhuangtao
authored andcommitted
arm64: dts: rockchip: add vpu for rk3366 android7.1
Change-Id: I798a6518a2a74fe07ae2bb82abaca2da501ae07b Signed-off-by: Zorro Liu <lyx@rock-chips.com>
1 parent ecac203 commit 11c8364

2 files changed

Lines changed: 64 additions & 0 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3366-android.dtsi

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,34 @@
8383
};
8484
};
8585

86+
&iep_mmu {
87+
status = "okay";
88+
};
89+
90+
&iep {
91+
status = "okay";
92+
};
93+
94+
&rkvdec {
95+
status = "okay";
96+
};
97+
98+
&vdec_mmu {
99+
status = "okay";
100+
};
101+
86102
&vopb_mmu {
87103
status = "okay";
88104
};
89105

90106
&vopb {
91107
status = "okay";
92108
};
109+
110+
&vpu_mmu {
111+
status = "okay";
112+
};
113+
114+
&vpu {
115+
status = "okay";
116+
};

arch/arm64/boot/dts/rockchip/rk3366.dtsi

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -893,14 +893,25 @@
893893
iep: iep@ff900000 {
894894
compatible = "rockchip,iep";
895895
iommu_enabled = <1>;
896+
iommus = <&iep_mmu>;
896897
reg = <0x0 0xff900000 0x0 0x800>;
897898
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
898899
clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
899900
clock-names = "aclk_iep", "hclk_iep";
901+
allocator = <1>;
900902
version = <2>;
901903
status = "disabled";
902904
};
903905

906+
iep_mmu: iommu@ff900800 {
907+
compatible = "rockchip,iommu";
908+
reg = <0x0 0xff900800 0x0 0x100>;
909+
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
910+
interrupt-names = "iep_mmu";
911+
#iommu-cells = <0>;
912+
status = "disabled";
913+
};
914+
904915
rga: rga@ff920000 {
905916
compatible = "rockchip,rga2";
906917
dev_mode = <1>;
@@ -1015,6 +1026,7 @@
10151026
compatible = "rockchip,vpu_service";
10161027
rockchip,grf = <&grf>;
10171028
iommu_enabled = <1>;
1029+
iommus = <&vpu_mmu>;
10181030
reg = <0x0 0xff9a0000 0x0 0x800>;
10191031
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
10201032
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
@@ -1025,12 +1037,26 @@
10251037
reset-names = "video_h", "video_a";
10261038
name = "vpu_service";
10271039
dev_mode = <0>;
1040+
/* 0 means ion, 1 means drm */
1041+
allocator = <1>;
1042+
status = "disabled";
1043+
};
1044+
1045+
vpu_mmu: iommu@ff9a0800 {
1046+
compatible = "rockchip,iommu";
1047+
reg = <0x0 0xff9a0800 0x0 0x100>;
1048+
interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
1049+
interrupt-names = "vpu_mmu";
1050+
clocks = <&cru ACLK_VIDEO>, <&cru HCLK_VIDEO>;
1051+
clock-names = "aclk", "hclk";
1052+
#iommu-cells = <0>;
10281053
status = "disabled";
10291054
};
10301055

10311056
rkvdec: rkvdec@ff9b0000 {
10321057
compatible = "rockchip,rkvdec";
10331058
rockchip,grf = <&grf>;
1059+
iommus = <&vdec_mmu>;
10341060
iommu_enabled = <1>;
10351061
reg = <0x0 0xff9b0000 0x0 0x400>;
10361062
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
@@ -1041,6 +1067,20 @@
10411067
reset-names = "video_h", "video_a";
10421068
dev_mode = <2>;
10431069
name = "rkvdec";
1070+
/* 0 means ion, 1 means drm */
1071+
allocator = <1>;
1072+
status = "disabled";
1073+
};
1074+
1075+
vdec_mmu: iommu@ff9b0480 {
1076+
compatible = "rockchip,iommu";
1077+
reg = <0x0 0xff9b0480 0x0 0x40>,
1078+
<0x0 0xff9b04c0 0x0 0x40>;
1079+
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
1080+
interrupt-names = "vdec_mmu";
1081+
clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;
1082+
clock-names = "aclk", "hclk";
1083+
#iommu-cells = <0>;
10441084
status = "disabled";
10451085
};
10461086

0 commit comments

Comments
 (0)