diff options
| author | Xu Han <hanxu@codeaurora.org> | 2015-11-16 17:12:02 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:15:42 -0700 |
| commit | 73313fe3cc97d223cbcce6032887fe2755dddfab (patch) | |
| tree | f35d32174a77bed062a89f22937286e4335b66a8 | |
| parent | 24dc1862e715406ab76c9fec01cc36e9d1cbe30b (diff) | |
msm: camera: CSI PHY setting update
CSI PHY setting is updated for maximum timing margin to
support high data rate up to 2.5Gbps/lane.
Change-Id: I165a5bc4467da83dda26deb56af16cbe64902515
Signed-off-by: Xu Han <hanxu@codeaurora.org>
4 files changed, 10 insertions, 8 deletions
diff --git a/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_4_2_hwreg.h b/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_4_2_hwreg.h index 8255884a022c..cfcf8cadd91b 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_4_2_hwreg.h +++ b/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_4_2_hwreg.h @@ -88,6 +88,7 @@ struct csiphy_reg_3ph_parms_t csiphy_v3_4_2_3ph = { {0x3C, 0xB8}, {0x1C, 0xE7}, {0x14, 0x0}, - {0x14, 0x60} + {0x14, 0x60}, + {0x700, 0x80} }; #endif diff --git a/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_5_hwreg.h b/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_5_hwreg.h index cf1b0ad2dd1b..4521d46f5d6c 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_5_hwreg.h +++ b/drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_5_hwreg.h @@ -76,7 +76,7 @@ struct csiphy_reg_3ph_parms_t csiphy_v3_5_3ph = { {0x854, 0xFF}, {0x28, 0x0}, {0x800, 0x0}, - {0x0, 0xCF}, + {0x0, 0xD7}, {0x4, 0x8}, {0x8, 0x0}, {0xC, 0xA5}, @@ -89,5 +89,6 @@ struct csiphy_reg_3ph_parms_t csiphy_v3_5_3ph = { {0x1C, 0xA}, {0x14, 0x0}, {0x0, 0x0}, + {0x700, 0xC0}, }; #endif 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 fc397e675840..69b3b3c2398d 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 @@ -366,12 +366,11 @@ static int msm_csiphy_2phase_lane_config( mipi_csiphy_2ph_lnn_cfg3.addr + offset); if (clk_lane == 1) { - if (csiphy_dev->hw_version == CSIPHY_VERSION_V342) { - msm_camera_io_w(0x80, - 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_3ph_lnck_cfg1.data, csiphybase + + csiphy_dev->ctrl_reg->csiphy_3ph_reg. + mipi_csiphy_3ph_lnck_cfg1.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. diff --git a/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h b/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h index b722b26e091f..7d419799bc2c 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h +++ b/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h @@ -123,6 +123,7 @@ struct csiphy_reg_3ph_parms_t { struct csiphy_reg_t mipi_csiphy_2ph_lnn_test_imp; struct csiphy_reg_t mipi_csiphy_2ph_lnn_test_force; struct csiphy_reg_t mipi_csiphy_2ph_lnn_ctrl5; + struct csiphy_reg_t mipi_csiphy_3ph_lnck_cfg1; }; struct csiphy_ctrl_t { |