From: zyc <zyc@rock-chips.com>
Date: Sat, 29 Mar 2014 01:45:03 +0000 (+0800)
Subject: isp: disable camsys log.
X-Git-Tag: firefly_0821_release~5725
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa2313f198bd7e689f751ba25e4f77e6118d5ee2;p=firefly-linux-kernel-4.4.55.git

isp: disable camsys log.
---

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index 15c540d90b3f..b901ebc4671e 100755
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -88,7 +88,7 @@ extern unsigned int camsys_debug;
 
 #define camsys_trace(level, msg,...) \
 	do { \
-		if (1/*camsys_debug >= level*/) \
+		if (camsys_debug >= level) \
 			printk("D%d:%s(%d): " msg "\n",level, __FUNCTION__,__LINE__, ## __VA_ARGS__); \
 	} while (0)
 
diff --git a/drivers/media/video/rk_camsys/camsys_mipicsi_phy.c b/drivers/media/video/rk_camsys/camsys_mipicsi_phy.c
index f973906d43ca..407ada10c465 100755
--- a/drivers/media/video/rk_camsys/camsys_mipicsi_phy.c
+++ b/drivers/media/video/rk_camsys/camsys_mipicsi_phy.c
@@ -235,10 +235,9 @@ static int camsys_mipiphy_ops (void *phy, void *phyinfo, unsigned int on)
     //disable isp
         write_grf_reg(GRF_SOC_CON6_OFFSET, MIPI_PHY_DISABLE_ISP_MASK | 1); 
         phy_select(0);
-    //    phy_config_num_lane(0,2);
+        phy_config_num_lane(0,1);
         phy0_start(0,1);
 
-        phy_config_num_lane(0,1);
         udelay(200);
     //enable isp
         write_grf_reg(GRF_SOC_CON6_OFFSET, MIPI_PHY_DISABLE_ISP_MASK | 0);