diff options
| author | Viswanadha Raju Thotakura <viswanad@codeaurora.org> | 2016-04-25 12:38:34 -0700 |
|---|---|---|
| committer | Jeevan Shriram <jshriram@codeaurora.org> | 2016-05-03 15:54:37 -0700 |
| commit | 52f8dab4b0f54be9baa653480621a3c391d061f4 (patch) | |
| tree | 95ba6f4e6909f5ee7d15141007194e18c2a4cbfa /drivers | |
| parent | 472039604223311606fbcc7d8e2726565c130e17 (diff) | |
msm: camera: Correct hardware register settings for CSIPHY
Correct settle_cnt settings in the CSIPHY driver, enable
register value for CSIPHYwq.
CRs-Fixed: 1011110
Change-Id: I2000cab0a56a890cbd5503306a794e6b9b295db6
Signed-off-by: Viswanadha Raju Thotakura <viswanad@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_5_0_hwreg.h | 2 | ||||
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_5_0_hwreg.h b/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_5_0_hwreg.h index 169f6b5f130a..c1102c866ccf 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_5_0_hwreg.h +++ b/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_5_0_hwreg.h @@ -63,7 +63,7 @@ struct csiphy_reg_3ph_parms_t csiphy_v5_0_3ph = { {0x180, 0x0}, {0x184, 0x7F}, {0x1cc, 0x41}, - {0x81c, 0x1}, + {0x81c, 0x2}, {0x82c, 0xFF}, {0x830, 0xFF}, {0x834, 0xFB}, diff --git a/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c b/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c index d690200b3c57..c9912f979b0a 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c +++ b/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c @@ -633,10 +633,12 @@ static int msm_csiphy_2phase_lane_config_v50( mipi_csiphy_2ph_lnn_cfg5.data, csiphybase + csiphy_dev->ctrl_reg->csiphy_3ph_reg. mipi_csiphy_2ph_lnn_cfg5.addr + offset); - msm_camera_io_w(csiphy_dev->ctrl_reg->csiphy_3ph_reg. - mipi_csiphy_2ph_lnck_ctrl10.data, - csiphybase + csiphy_dev->ctrl_reg->csiphy_3ph_reg. - mipi_csiphy_2ph_lnck_ctrl10.addr); + if (clk_lane == 1) + msm_camera_io_w(csiphy_dev->ctrl_reg->csiphy_3ph_reg. + mipi_csiphy_2ph_lnck_ctrl10.data, + csiphybase + + csiphy_dev->ctrl_reg->csiphy_3ph_reg. + mipi_csiphy_2ph_lnck_ctrl10.addr); msm_camera_io_w(csiphy_dev->ctrl_reg->csiphy_3ph_reg. mipi_csiphy_2ph_lnn_ctrl15.data, csiphybase + csiphy_dev->ctrl_reg->csiphy_3ph_reg. @@ -649,14 +651,14 @@ static int msm_csiphy_2phase_lane_config_v50( mipi_csiphy_2ph_lnn_cfg1.data, csiphybase + csiphy_dev->ctrl_reg->csiphy_3ph_reg. mipi_csiphy_2ph_lnn_cfg1.addr + offset); - msm_camera_io_w(csiphy_dev->ctrl_reg->csiphy_3ph_reg. - mipi_csiphy_2ph_lnn_cfg2.data, + msm_camera_io_w((csiphy_params->settle_cnt & 0xFF), csiphybase + csiphy_dev->ctrl_reg->csiphy_3ph_reg. mipi_csiphy_2ph_lnn_cfg2.addr + offset); - msm_camera_io_w(csiphy_dev->ctrl_reg->csiphy_3ph_reg. - mipi_csiphy_2ph_lnck_ctrl3.data, - csiphybase + csiphy_dev->ctrl_reg->csiphy_3ph_reg. - mipi_csiphy_2ph_lnck_ctrl3.addr); + if (clk_lane == 1) + msm_camera_io_w(csiphy_dev->ctrl_reg->csiphy_3ph_reg. + mipi_csiphy_2ph_lnck_ctrl3.data, csiphybase + + csiphy_dev->ctrl_reg->csiphy_3ph_reg. + mipi_csiphy_2ph_lnck_ctrl3.addr); msm_camera_io_w(csiphy_dev->ctrl_reg->csiphy_3ph_reg. mipi_csiphy_2ph_lnn_cfg4.data, csiphybase + csiphy_dev->ctrl_reg->csiphy_3ph_reg. |