camera: rockchip: camsys_drv: v0.0x22.8

3399 ISP power management is wrong, correct it.

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

Author: Zhang Yunlong

drivers/media/video/rk_camsys/camsys_internal.h

@@ -183,9 +183,11 @@
 *v0.0x22.7:
 	1) read MRV_MIPI_FRAME register in camsys_mrv_irq, and pass the value
 	fs_id and fe_id into isp library.
+*v0.0x22.8:
+	1) 3399 power management is wrong, correct it.
 */
 
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0, 0x22, 7)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0, 0x22, 8)
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"
 #define CAMSYS_PLATFORM_MARVIN_NAME             "Platform_MarvinDev"

drivers/media/video/rk_camsys/camsys_marvin.c

@@ -576,14 +576,15 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
 			}
 
 			clk->in_on = true;
-
+			pm_runtime_get_sync(&camsys_dev->pdev->dev);
 			camsys_trace(1, "%s clock(f: %ld Hz) in turn on",
 				     dev_name(camsys_dev->miscdev.this_device),
 				     isp_clk);
 			camsys_mrv_reset_cb(ptr, 1);
 			udelay(100);
 			camsys_mrv_reset_cb(ptr, 0);
 		} else if (!on && clk->in_on) {
+			pm_runtime_put_sync(&camsys_dev->pdev->dev);
 			if (strstr(camsys_dev->miscdev.name,
 				"camsys_marvin1")) {
 				clk_disable_unprepare(clk->hclk_isp1_noc);
@@ -676,9 +677,6 @@ static int camsys_mrv_clkout_cb(void *ptr, unsigned int on, unsigned int inclk)
 
 	mutex_lock(&clk->lock);
 	if (on && (clk->out_on != on)) {
-
-		pm_runtime_get_sync(&camsys_dev->pdev->dev);
-
 		clk_set_rate(clk->cif_clk_out, inclk);
 		clk_prepare_enable(clk->cif_clk_out);
 		clk->out_on = on;
@@ -695,8 +693,6 @@ static int camsys_mrv_clkout_cb(void *ptr, unsigned int on, unsigned int inclk)
 		}
 
 		clk_disable_unprepare(clk->cif_clk_out);
-
-		pm_runtime_disable(&camsys_dev->pdev->dev);
 		clk->out_on = 0;
 
 		camsys_trace(1, "%s clock out turn off",