commit 1bcf72b08eab86755f21c32beb901eab96906b30
author Linux Build Service Account <lnxbuild@localhost> Fri Dec 09 02:43:11 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Fri Dec 09 02:43:11 2011 -0800
tree e380d54cb7997415ae16cae3cbeba55a12de6d7d
parent d22f17065fc6896dd36b88afb66b3da6261df2ad
parent 61656ae72b6505f50b2250c7d773b2b551a9c9bc

Merge "msm: camera: Remove skew from csi phy data lanes" into msm-3.0

drivers/media/video/msm/csi/msm_csiphy.c

diff --git a/drivers/media/video/msm/csi/msm_csiphy.c b/drivers/media/video/msm/csi/msm_csiphy.c
index b62ec84..109b3dd 100644
--- a/drivers/media/video/msm/csi/msm_csiphy.c
+++ b/drivers/media/video/msm/csi/msm_csiphy.c
@@ -79,7 +79,7 @@
 	msm_io_w(0x1, csiphybase + MIPI_CSIPHY_T_WAKEUP_CFG0_ADDR);
 
 	for (i = 0; i < csiphy_params->lane_cnt; i++) {
-		msm_io_w(0x10, csiphybase + MIPI_CSIPHY_LNn_CFG1_ADDR + 0x40*i);
+		msm_io_w(0x00, csiphybase + MIPI_CSIPHY_LNn_CFG1_ADDR + 0x40*i);
 		msm_io_w(0x5F, csiphybase + MIPI_CSIPHY_LNn_CFG2_ADDR + 0x40*i);
 		msm_io_w(csiphy_params->settle_cnt,
 			csiphybase + MIPI_CSIPHY_LNn_CFG3_ADDR + 0x40*i);