From f372e74059cb9695b7ba07b74adffa5c85d87d32 Mon Sep 17 00:00:00 2001 From: ddl Date: Fri, 13 Jun 2014 16:24:40 +0800 Subject: [PATCH] camsys_drv: v0.0x11.0 --- drivers/media/video/rk_camsys/camsys_soc_priv.c | 7 ++++--- drivers/media/video/rk_camsys/camsys_soc_rk3288.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/media/video/rk_camsys/camsys_soc_priv.c b/drivers/media/video/rk_camsys/camsys_soc_priv.c index c1c22ebf7d08..7d62386ee2ea 100755 --- a/drivers/media/video/rk_camsys/camsys_soc_priv.c +++ b/drivers/media/video/rk_camsys/camsys_soc_priv.c @@ -39,13 +39,14 @@ static int camsys_rk3288_cfg (camsys_soc_cfg_t cfg_cmd, void* cfg_para) case Isp_SoftRst: /* ddl@rock-chips.com: v0.d.0 */ { - para_int = (unsigned int*)cfg_para; + unsigned int reset; + reset = (unsigned int)cfg_para; - if (para_int) + if (reset == 1) cru_writel(0x40004000,0x1d0); else cru_writel(0x40000000,0x1d0); - camsys_trace(1, "Isp_SoftRst: %d",para_int); + camsys_trace(1, "Isp_SoftRst: %d",reset); break; } diff --git a/drivers/media/video/rk_camsys/camsys_soc_rk3288.c b/drivers/media/video/rk_camsys/camsys_soc_rk3288.c index 41048d950a8e..a1d008f2b4af 100755 --- a/drivers/media/video/rk_camsys/camsys_soc_rk3288.c +++ b/drivers/media/video/rk_camsys/camsys_soc_rk3288.c @@ -60,12 +60,12 @@ static int camsys_rk3288_mipiphy0_wr_reg(unsigned char addr, unsigned char data) } return 0; } - +#if 0 static int camsys_rk3288_mipiphy0_rd_reg(unsigned char addr) { return read_grf_reg(GRF_SOC_STATUS21); } - +#endif static int camsys_rk3288_mipiphy1_wr_reg(unsigned int phy_virt,unsigned char addr, unsigned char data) { -- 2.34.1