From: dalon.zhang <dalon.zhang@rock-chips.com>
Date: Sun, 19 Mar 2017 03:50:59 +0000 (+0800)
Subject: camera: rockchip: camsys v0.0x21.0xa
X-Git-Tag: firefly_0821_release~270
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df804a00a9448cb6b8f7e387555d4660ad029dfb;p=firefly-linux-kernel-4.4.55.git

camera: rockchip: camsys v0.0x21.0xa

Change-Id: Ic9c5661ba76eaf8aee36e1a1822aa9bcd288e0ac
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
---

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index 11efb236005f..045d01f5fe83 100644
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -151,8 +151,10 @@
 	if process cameraserver was died during streaming, iommu resource
 	was not released correctly. when cameraserver was recovered and
 	streaming again, iommu resource may be conflicted.
+*v0.0x21.0xa:
+	1) clock clk_vio0_noc would cause mipi lcdc no display on 3368h, remove it.
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0, 0x21, 9)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0, 0x21, 0xa)
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"
 #define CAMSYS_PLATFORM_MARVIN_NAME             "Platform_MarvinDev"
diff --git a/drivers/media/video/rk_camsys/camsys_marvin.c b/drivers/media/video/rk_camsys/camsys_marvin.c
old mode 100755
new mode 100644
index e3e236f0e085..d4799695e486
--- a/drivers/media/video/rk_camsys/camsys_marvin.c
+++ b/drivers/media/video/rk_camsys/camsys_marvin.c
@@ -627,8 +627,6 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
 		if (CHIP_TYPE == 3368 || CHIP_TYPE == 3366) {
 			clk_prepare_enable(clk->cif_clk_out);
 			clk_prepare_enable(clk->pclk_dphyrx);
-			if (CHIP_TYPE == 3368)
-				clk_prepare_enable(clk->clk_vio0_noc);
 		} else {
 			clk_prepare_enable(clk->clk_mipi_24m);
 		}
@@ -648,8 +646,6 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
 		if (CHIP_TYPE == 3368 || CHIP_TYPE == 3366) {
 			clk_disable_unprepare(clk->cif_clk_out);
 			clk_disable_unprepare(clk->pclk_dphyrx);
-			if (CHIP_TYPE == 3368)
-				clk_disable_unprepare(clk->clk_vio0_noc);
 		} else {
 			clk_disable_unprepare(clk->clk_mipi_24m);
 		}