From 11c83641dfc45219374d95346cbde180c123e77f Mon Sep 17 00:00:00 2001
From: Zorro Liu <lyx@rock-chips.com>
Date: Fri, 14 Jul 2017 11:22:33 +0800
Subject: [PATCH] arm64: dts: rockchip: add vpu for rk3366 android7.1

Change-Id: I798a6518a2a74fe07ae2bb82abaca2da501ae07b
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
---
 .../boot/dts/rockchip/rk3366-android.dtsi     | 24 +++++++++++
 arch/arm64/boot/dts/rockchip/rk3366.dtsi      | 40 +++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3366-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3366-android.dtsi
index cb111b2cec8f..8fc33a569824 100644
--- a/arch/arm64/boot/dts/rockchip/rk3366-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3366-android.dtsi
@@ -83,6 +83,22 @@
 	};
 };
 
+&iep_mmu {
+	status = "okay";
+};
+
+&iep {
+	status = "okay";
+};
+
+&rkvdec {
+	status = "okay";
+};
+
+&vdec_mmu {
+	status = "okay";
+};
+
 &vopb_mmu {
 	status = "okay";
 };
@@ -90,3 +106,11 @@
 &vopb {
 	status = "okay";
 };
+
+&vpu_mmu {
+	status = "okay";
+};
+
+&vpu {
+	status = "okay";
+};
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/rockchip/rk3366.dtsi b/arch/arm64/boot/dts/rockchip/rk3366.dtsi
index 1b7b66f8489c..372d68129ac3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3366.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3366.dtsi
@@ -893,14 +893,25 @@
 	iep: iep@ff900000 {
 		compatible = "rockchip,iep";
 		iommu_enabled = <1>;
+		iommus = <&iep_mmu>;
 		reg = <0x0 0xff900000 0x0 0x800>;
 		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
 		clock-names = "aclk_iep", "hclk_iep";
+		allocator = <1>;
 		version = <2>;
 		status = "disabled";
 	};
 
+	iep_mmu: iommu@ff900800 {
+		compatible = "rockchip,iommu";
+		reg = <0x0 0xff900800 0x0 0x100>;
+		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "iep_mmu";
+		#iommu-cells = <0>;
+		status = "disabled";
+	};
+
 	rga: rga@ff920000 {
 		compatible = "rockchip,rga2";
 		dev_mode = <1>;
@@ -1015,6 +1026,7 @@
 		compatible = "rockchip,vpu_service";
 		rockchip,grf = <&grf>;
 		iommu_enabled = <1>;
+		iommus = <&vpu_mmu>;
 		reg = <0x0 0xff9a0000 0x0 0x800>;
 		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
 			<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
@@ -1025,12 +1037,26 @@
 		reset-names = "video_h", "video_a";
 		name = "vpu_service";
 		dev_mode = <0>;
+		/* 0 means ion, 1 means drm */
+		allocator = <1>;
+		status = "disabled";
+	};
+
+	vpu_mmu: iommu@ff9a0800 {
+		compatible = "rockchip,iommu";
+		reg = <0x0 0xff9a0800 0x0 0x100>;
+		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "vpu_mmu";
+		clocks = <&cru ACLK_VIDEO>, <&cru HCLK_VIDEO>;
+		clock-names = "aclk", "hclk";
+		#iommu-cells = <0>;
 		status = "disabled";
 	};
 
 	rkvdec: rkvdec@ff9b0000 {
 		compatible = "rockchip,rkvdec";
 		rockchip,grf = <&grf>;
+		iommus = <&vdec_mmu>;
 		iommu_enabled = <1>;
 		reg = <0x0 0xff9b0000 0x0 0x400>;
 		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
@@ -1041,6 +1067,20 @@
 		reset-names = "video_h", "video_a";
 		dev_mode = <2>;
 		name = "rkvdec";
+		/* 0 means ion, 1 means drm */
+		allocator = <1>;
+		status = "disabled";
+	};
+
+	vdec_mmu: iommu@ff9b0480 {
+		compatible = "rockchip,iommu";
+		reg = <0x0 0xff9b0480 0x0 0x40>,
+			<0x0 0xff9b04c0 0x0 0x40>;
+		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "vdec_mmu";
+		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;
+		clock-names = "aclk", "hclk";
+		#iommu-cells = <0>;
 		status = "disabled";
 	};
 
-- 
2.34.1