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

clk: msm: mdss: fix PHY programming for flip plug orientation

Browse source 
Fix the PHY programming sequence for flip plug orientation by
ensuring that the correct PHY_MODE and LANE_MODE values are
selected, depending on the orientation and link rate
respectively.

Change-Id: I6e74c20c509b7007a86df9d99894a9a6c0baa946
Signed-off-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
CRs-Fixed: 1062508
This commit is contained in:
Tatenda Chipeperekwa 2016-11-28 17:11:07 -08:00
parent 9aa1df0cf5
commit 5582e2ae28
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/clk/msm/mdss/mdss-dp-pll-8998-util.c
View file

@ -29,6 +29,8 @@ int link2xclk_divsel_set_div(struct div_clk *clk, int div)
int rc; int rc;
u32 link2xclk_div_tx0, link2xclk_div_tx1; u32 link2xclk_div_tx0, link2xclk_div_tx1;
u32 phy_mode; u32 phy_mode;
u8 orientation;
u32 spare_value;
struct mdss_pll_resources *dp_res = clk->priv; struct mdss_pll_resources *dp_res = clk->priv;
rc = mdss_pll_resource_enable(dp_res, true); rc = mdss_pll_resource_enable(dp_res, true);
@ -37,6 +39,11 @@ int link2xclk_divsel_set_div(struct div_clk *clk, int div)
return rc; return rc;
} }
spare_value = MDSS_PLL_REG_R(dp_res->phy_base, DP_PHY_SPARE0);
orientation = (spare_value & 0xF0) >> 4;
pr_debug("spare_value=0x%x, orientation=0x%x\n", spare_value,
orientation);
link2xclk_div_tx0 = MDSS_PLL_REG_R(dp_res->phy_base, link2xclk_div_tx0 = MDSS_PLL_REG_R(dp_res->phy_base,
QSERDES_TX0_OFFSET + TXn_TX_BAND); QSERDES_TX0_OFFSET + TXn_TX_BAND);
link2xclk_div_tx1 = MDSS_PLL_REG_R(dp_res->phy_base, link2xclk_div_tx1 = MDSS_PLL_REG_R(dp_res->phy_base,
@ -49,8 +56,12 @@ int link2xclk_divsel_set_div(struct div_clk *clk, int div)
link2xclk_div_tx0 |= 0x4; link2xclk_div_tx0 |= 0x4;
link2xclk_div_tx1 |= 0x4; link2xclk_div_tx1 |= 0x4;
/*configure DP PHY MODE */ /* Configure DP PHY MODE depending on the plug orientation */
phy_mode = 0x58; if (orientation == ORIENTATION_CC2)
phy_mode = 0x48;
else
phy_mode = 0x58;
MDSS_PLL_REG_W(dp_res->phy_base, MDSS_PLL_REG_W(dp_res->phy_base,
QSERDES_TX0_OFFSET + TXn_TX_BAND, QSERDES_TX0_OFFSET + TXn_TX_BAND,
@ -334,11 +345,9 @@ int dp_config_vco_rate(struct dp_pll_vco_clk *vco, unsigned long rate)
wmb(); wmb();
if (orientation == ORIENTATION_CC2) if (orientation == ORIENTATION_CC2)
MDSS_PLL_REG_W(dp_res->phy_base, MDSS_PLL_REG_W(dp_res->phy_base, DP_PHY_MODE, 0x48);
DP_PHY_MODE, 0x48);
else else
MDSS_PLL_REG_W(dp_res->phy_base, MDSS_PLL_REG_W(dp_res->phy_base, DP_PHY_MODE, 0x58);
DP_PHY_MODE, 0x58);
MDSS_PLL_REG_W(dp_res->phy_base, MDSS_PLL_REG_W(dp_res->phy_base,
DP_PHY_TX0_TX1_LANE_CTL, 0x05); DP_PHY_TX0_TX1_LANE_CTL, 0x05);
@ -452,7 +461,7 @@ static int dp_pll_enable(struct clk *c)
struct dp_pll_vco_clk *vco = mdss_dp_to_vco_clk(c); struct dp_pll_vco_clk *vco = mdss_dp_to_vco_clk(c);
struct mdss_pll_resources *dp_res = vco->priv; struct mdss_pll_resources *dp_res = vco->priv;
u8 orientation, ln_cnt; u8 orientation, ln_cnt;
u32 spare_value, bias_en, drvr_en; u32 spare_value, bias_en, drvr_en, lane_mode;
spare_value = MDSS_PLL_REG_R(dp_res->phy_base, DP_PHY_SPARE0); spare_value = MDSS_PLL_REG_R(dp_res->phy_base, DP_PHY_SPARE0);
ln_cnt = spare_value & 0x0F; ln_cnt = spare_value & 0x0F;
@ -562,12 +571,18 @@ static int dp_pll_enable(struct clk *c)
*/ */
wmb(); wmb();
if (vco->rate == DP_VCO_HSCLK_RATE_2700MHZDIV1000)
lane_mode = 0xc6;
else
lane_mode = 0xf6;
MDSS_PLL_REG_W(dp_res->phy_base, MDSS_PLL_REG_W(dp_res->phy_base,
QSERDES_TX0_OFFSET + TXn_LANE_MODE_1, QSERDES_TX0_OFFSET + TXn_LANE_MODE_1,
0xf6); lane_mode);
MDSS_PLL_REG_W(dp_res->phy_base, MDSS_PLL_REG_W(dp_res->phy_base,
QSERDES_TX1_OFFSET + TXn_LANE_MODE_1, QSERDES_TX1_OFFSET + TXn_LANE_MODE_1,
0xf6); lane_mode);
MDSS_PLL_REG_W(dp_res->phy_base, MDSS_PLL_REG_W(dp_res->phy_base,
QSERDES_TX0_OFFSET + TXn_CLKBUF_ENABLE, QSERDES_TX0_OFFSET + TXn_CLKBUF_ENABLE,
0x1f); 0x1f);