From: Jacob Chen <jacob2.chen@rock-chips.com>
Date: Tue, 11 Jul 2017 05:26:40 +0000 (+0800)
Subject: ARM: dts: rockchip: use iommu for rk3288 v4l2 isp
X-Git-Tag: release-20171130_firefly~4^2~178
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=abbe13bf464734cc00f28195a7570b400708cdfd;p=firefly-linux-kernel-4.4.55.git

ARM: dts: rockchip: use iommu for rk3288 v4l2 isp

we have videobuf2 cip isp support now

Change-Id: I7f6da305f2a4a658a4097e06361c694ca6ba9a18
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
---

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index bc927de4aec8..945992810932 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -1088,7 +1088,7 @@
 	cif_isp0: cif_isp@ff910000 {
 		compatible = "rockchip,rk3288-cif-isp";
 		rockchip,grf = <&grf>;
-		reg = <0x0 0xff910000 0x0 0x10000>, <0x0 0xff968000 0x0 0x4000>;
+		reg = <0x0 0xff910000 0x0 0x4000>, <0x0 0xff968000 0x0 0x4000>;
 		reg-names = "register", "csihost-register";
 		clocks = <&cru ACLK_ISP>, <&cru HCLK_ISP>,
 			<&cru SCLK_ISP>, <&cru SCLK_ISP_JPE>,
@@ -1102,6 +1102,9 @@
 		reset-names = "rst_isp";
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "cif_isp10_irq";
+		power-domains = <&power RK3288_PD_VIO>;
+		rockchip,isp,iommu-enable = <1>;
+		iommus = <&isp_mmu>;
 		status = "disabled";
 	};