diff options
| author | Padmanabhan Komanduru <pkomandu@codeaurora.org> | 2015-11-19 16:22:31 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:48:05 -0700 |
| commit | a1aedeeb038a8d09c5a2a50b83454fad79f17b29 (patch) | |
| tree | 7d767119c174905dda6150db6dac861ceb656f8e /drivers | |
| parent | 87345f4cdeb15fe0f6851e4b76cab5dea021d2ec (diff) | |
msm: mdss: update the DSI h/w revision based checks for msm8937
The step version is different between msm8996 and msm8937 even
though the major/minor versions are the same. Update the DSI PHY
and clamp register programming for msm8937 by checking for the
step version to avoid incorrect DSI register programming.
Change-Id: Ia9582b2779f40429586e8709bb73c9a5c79bd6c5
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dsi.h | 4 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/msm_mdss_io_8974.c | 24 |
2 files changed, 22 insertions, 6 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi.h b/drivers/video/fbdev/msm/mdss_dsi.h index 202a378f5449..7922bba30d52 100644 --- a/drivers/video/fbdev/msm/mdss_dsi.h +++ b/drivers/video/fbdev/msm/mdss_dsi.h @@ -61,6 +61,10 @@ #define MDSS_DSI_HW_REV_104_1 0x10040001 /* 8996 */ #define MDSS_DSI_HW_REV_104_2 0x10040002 /* 8937 */ +#define MDSS_DSI_HW_REV_STEP_0 0x0 +#define MDSS_DSI_HW_REV_STEP_1 0x1 +#define MDSS_DSI_HW_REV_STEP_2 0x2 + #define NONE_PANEL "none" enum { /* mipi dsi panel */ diff --git a/drivers/video/fbdev/msm/msm_mdss_io_8974.c b/drivers/video/fbdev/msm/msm_mdss_io_8974.c index c491e219d5e3..b01bc180809c 100644 --- a/drivers/video/fbdev/msm/msm_mdss_io_8974.c +++ b/drivers/video/fbdev/msm/msm_mdss_io_8974.c @@ -81,7 +81,9 @@ void mdss_dsi_phy_sw_reset(struct mdss_dsi_ctrl_pdata *ctrl) } if (IS_MDSS_MAJOR_MINOR_SAME(ctrl->shared_data->hw_rev, - MDSS_DSI_HW_REV_104)) { + MDSS_DSI_HW_REV_104) && + (MDSS_GET_STEP(ctrl->shared_data->hw_rev) != + MDSS_DSI_HW_REV_STEP_2)) { if (mdss_dsi_is_ctrl_clk_master(ctrl)) sctrl = mdss_dsi_get_ctrl_clk_slave(); else @@ -119,7 +121,9 @@ static void mdss_dsi_phy_regulator_disable(struct mdss_dsi_ctrl_pdata *ctrl) } if (IS_MDSS_MAJOR_MINOR_SAME(ctrl->shared_data->hw_rev, - MDSS_DSI_HW_REV_104)) + MDSS_DSI_HW_REV_104) && + (MDSS_GET_STEP(ctrl->shared_data->hw_rev) != + MDSS_DSI_HW_REV_STEP_2)) return; MIPI_OUTP(ctrl->phy_regulator_io.base + 0x018, 0x000); @@ -133,7 +137,9 @@ static void mdss_dsi_phy_shutdown(struct mdss_dsi_ctrl_pdata *ctrl) } if (IS_MDSS_MAJOR_MINOR_SAME(ctrl->shared_data->hw_rev, - MDSS_DSI_HW_REV_104)) { + MDSS_DSI_HW_REV_104) && + (MDSS_GET_STEP(ctrl->shared_data->hw_rev) != + MDSS_DSI_HW_REV_STEP_2)) { MIPI_OUTP(ctrl->phy_io.base + DSIPHY_PLL_CLKBUFLR_EN, 0); MIPI_OUTP(ctrl->phy_io.base + DSIPHY_CMN_GLBL_TEST_CTRL, 0); MIPI_OUTP(ctrl->phy_io.base + DSIPHY_CMN_CTRL_0, 0); @@ -159,7 +165,9 @@ void mdss_dsi_lp_cd_rx(struct mdss_dsi_ctrl_pdata *ctrl) } if (IS_MDSS_MAJOR_MINOR_SAME(ctrl->shared_data->hw_rev, - MDSS_DSI_HW_REV_104)) + MDSS_DSI_HW_REV_104) && + (MDSS_GET_STEP(ctrl->shared_data->hw_rev) != + MDSS_DSI_HW_REV_STEP_2)) return; pd = &(((ctrl->panel_data).panel_info.mipi).dsi_phy_db); @@ -1278,7 +1286,9 @@ static int mdss_dsi_clamp_ctrl(struct mdss_dsi_ctrl_pdata *ctrl, int enable) * out of power collapse */ if (IS_MDSS_MAJOR_MINOR_SAME(ctrl->shared_data->hw_rev, - MDSS_DSI_HW_REV_104)) { + MDSS_DSI_HW_REV_104) && + (MDSS_GET_STEP(ctrl->shared_data->hw_rev) != + MDSS_DSI_HW_REV_STEP_2)) { regval = MIPI_INP(ctrl->mmss_misc_io.base + clamp_reg_off); @@ -1293,7 +1303,9 @@ static int mdss_dsi_clamp_ctrl(struct mdss_dsi_ctrl_pdata *ctrl, int enable) ctrl->mmss_clamp = true; } else if (!enable && ctrl->mmss_clamp) { if (IS_MDSS_MAJOR_MINOR_SAME(ctrl->shared_data->hw_rev, - MDSS_DSI_HW_REV_104)) { + MDSS_DSI_HW_REV_104) && + (MDSS_GET_STEP(ctrl->shared_data->hw_rev) != + MDSS_DSI_HW_REV_STEP_2)) { regval = MIPI_INP(ctrl->mmss_misc_io.base + clamp_reg_off); |