From: zyc <zyc@rock-chips.com>
Date: Tue, 29 Jul 2014 01:38:12 +0000 (+0800)
Subject: camsys_drv : v0.0x11.0
X-Git-Tag: firefly_0821_release~4951
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a6a2a7c6a9c2c887bbd11b43893a8e5e3caa3353;p=firefly-linux-kernel-4.4.55.git

camsys_drv : v0.0x11.0
---

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 438ae0d567d9..5c01843c7159 100755
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -130,6 +130,7 @@
 			};
 			vio1_isp_w0 {
 				reg = <0xffad0100 0x20>;
+				rockchip,priority = <2 2>;
 			};
 			vio1_isp_w1 {
 				reg = <0xffad0180 0x20>;
diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index f0a1455f9c58..f8b2a193c348 100755
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -86,9 +86,11 @@
 *v0.f.0:
 		 1) mi_mis register may read erro, this may cause mistaken mi frame_end irqs.  
 *v0.0x10.0:
-		 1) add flash_prelight control.		 
+		 1) add flash_prelight control.		
+*v0.0x11.0:
+         1) raise qos of isp up to the same as lcdc. 
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x10,0)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x11,0)
 
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"