evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: dsi: update DSI phy v3 initialization sequence"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-26 22:22:30 -07:00 • committed by Gerrit - the friendly Code Review server
commit 86e05456b9
2 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/clk/msm/mdss/mdss-dsi-pll-cobalt.c
View file

@ -454,8 +454,8 @@ static void dsi_pll_disable_pll_bias(struct mdss_pll_resources *rsc)
{ {
u32 data = MDSS_PLL_REG_R(rsc->phy_base, PHY_CMN_CTRL_0); u32 data = MDSS_PLL_REG_R(rsc->phy_base, PHY_CMN_CTRL_0);
MDSS_PLL_REG_W(rsc->phy_base, PHY_CMN_CTRL_0, data & ~BIT(5));
MDSS_PLL_REG_W(rsc->pll_base, PLL_SYSTEM_MUXES, 0); MDSS_PLL_REG_W(rsc->pll_base, PLL_SYSTEM_MUXES, 0);
MDSS_PLL_REG_W(rsc->phy_base, PHY_CMN_CTRL_0, data & ~BIT(5));
ndelay(250); ndelay(250);
} }
@ -468,6 +468,22 @@ static void dsi_pll_enable_pll_bias(struct mdss_pll_resources *rsc)
ndelay(250); ndelay(250);
} }
static void dsi_pll_disable_global_clk(struct mdss_pll_resources *rsc)
{
u32 data;
data = MDSS_PLL_REG_R(rsc->phy_base, PHY_CMN_CLK_CFG1);
MDSS_PLL_REG_W(rsc->phy_base, PHY_CMN_CLK_CFG1, (data & ~BIT(5)));
}
static void dsi_pll_enable_global_clk(struct mdss_pll_resources *rsc)
{
u32 data;
data = MDSS_PLL_REG_R(rsc->phy_base, PHY_CMN_CLK_CFG1);
MDSS_PLL_REG_W(rsc->phy_base, PHY_CMN_CLK_CFG1, (data | BIT(5)));
}
static int dsi_pll_enable(struct dsi_pll_vco_clk *vco) static int dsi_pll_enable(struct dsi_pll_vco_clk *vco)
{ {
int rc; int rc;
@ -494,6 +510,11 @@ static int dsi_pll_enable(struct dsi_pll_vco_clk *vco)
} }
rsc->pll_on = true; rsc->pll_on = true;
dsi_pll_enable_global_clk(rsc);
if (rsc->slave)
dsi_pll_enable_global_clk(rsc->slave);
MDSS_PLL_REG_W(rsc->phy_base, PHY_CMN_RBUF_CTRL, 0x01); MDSS_PLL_REG_W(rsc->phy_base, PHY_CMN_RBUF_CTRL, 0x01);
if (rsc->slave) if (rsc->slave)
MDSS_PLL_REG_W(rsc->slave->phy_base, PHY_CMN_RBUF_CTRL, 0x01); MDSS_PLL_REG_W(rsc->slave->phy_base, PHY_CMN_RBUF_CTRL, 0x01);
@ -504,8 +525,9 @@ error:
static void dsi_pll_disable_sub(struct mdss_pll_resources *rsc) static void dsi_pll_disable_sub(struct mdss_pll_resources *rsc)
{ {
dsi_pll_disable_pll_bias(rsc); dsi_pll_disable_global_clk(rsc);
MDSS_PLL_REG_W(rsc->phy_base, PHY_CMN_RBUF_CTRL, 0); MDSS_PLL_REG_W(rsc->phy_base, PHY_CMN_RBUF_CTRL, 0);
dsi_pll_disable_pll_bias(rsc);
} }
static void dsi_pll_disable(struct dsi_pll_vco_clk *vco) static void dsi_pll_disable(struct dsi_pll_vco_clk *vco)

15
drivers/video/fbdev/msm/mdss_dsi_phy_v3.c
View file

@ -113,8 +113,8 @@ static void mdss_dsi_phy_v3_set_pll_source(
else else
pll_src = 0x00; /* internal PLL */ pll_src = 0x00; /* internal PLL */
/* set the PLL src and set global clock enable */ /* set the PLL src */
reg = (pll_src << 2) | BIT(5); reg = (pll_src << 2);
DSI_PHY_W32(ctrl->phy_io.base, CMN_CLK_CFG1, reg); DSI_PHY_W32(ctrl->phy_io.base, CMN_CLK_CFG1, reg);
} }
@ -183,7 +183,7 @@ static void mdss_dsi_phy_v3_config_lane_settings(
struct mdss_dsi_ctrl_pdata *ctrl) struct mdss_dsi_ctrl_pdata *ctrl)
{ {
int i; int i;
u32 tx_dctrl[] = {0x98, 0x99, 0x98, 0x9a, 0x98}; u32 tx_dctrl[] = {0x18, 0x19, 0x18, 0x02, 0x18};
struct mdss_dsi_phy_ctrl *pd = struct mdss_dsi_phy_ctrl *pd =
&(((ctrl->panel_data).panel_info.mipi).dsi_phy_db); &(((ctrl->panel_data).panel_info.mipi).dsi_phy_db);
@ -198,8 +198,8 @@ static void mdss_dsi_phy_v3_config_lane_settings(
*/ */
DSI_PHY_W32(ctrl->phy_io.base, LNX_LPRX_CTRL(i), 0); DSI_PHY_W32(ctrl->phy_io.base, LNX_LPRX_CTRL(i), 0);
DSI_PHY_W32(ctrl->phy_io.base, LNX_HSTX_STR_CTRL(i), 0x88);
DSI_PHY_W32(ctrl->phy_io.base, LNX_PIN_SWAP(i), 0x0); DSI_PHY_W32(ctrl->phy_io.base, LNX_PIN_SWAP(i), 0x0);
DSI_PHY_W32(ctrl->phy_io.base, LNX_HSTX_STR_CTRL(i), 0x88);
} }
mdss_dsi_phy_v3_config_lpcdrx(ctrl, true); mdss_dsi_phy_v3_config_lpcdrx(ctrl, true);
@ -383,8 +383,11 @@ int mdss_dsi_phy_v3_init(struct mdss_dsi_ctrl_pdata *ctrl,
return rc; return rc;
} }
/* de-assert digital power down */ /* de-assert digital and pll power down */
DSI_PHY_W32(ctrl->phy_io.base, CMN_CTRL_0, BIT(6)); DSI_PHY_W32(ctrl->phy_io.base, CMN_CTRL_0, BIT(6) | BIT(5));
/* Assert PLL core reset */
DSI_PHY_W32(ctrl->phy_io.base, CMN_PLL_CNTRL, 0x00);
/* turn off resync FIFO */ /* turn off resync FIFO */
DSI_PHY_W32(ctrl->phy_io.base, CMN_RBUF_CTRL, 0x00); DSI_PHY_W32(ctrl->phy_io.base, CMN_RBUF_CTRL, 0x00);