Skip to content

Commit 73f69c6

Browse files
krzkAbhinav Kumar
authored andcommitted
drm/msm/dsi/phy: Do not overwite PHY_CMN_CLK_CFG1 when choosing bitclk source
PHY_CMN_CLK_CFG1 register has four fields being used in the driver: DSI clock divider, source of bitclk and two for enabling the DSI PHY PLL clocks. dsi_7nm_set_usecase() sets only the source of bitclk, so should leave all other bits untouched. Use newly introduced dsi_pll_cmn_clk_cfg1_update() to update respective bits without overwriting the rest. While shuffling the code, define and use PHY_CMN_CLK_CFG1 bitfields to make the code more readable and obvious. Fixes: 1ef7c99 ("drm/msm/dsi: add support for 7nm DSI PHY/PLL") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Patchwork: https://patchwork.freedesktop.org/patch/637380/ Link: https://lore.kernel.org/r/20250214-drm-msm-phy-pll-cfg-reg-v3-3-0943b850722c@linaro.org Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
1 parent 5a97bc9 commit 73f69c6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,6 @@ static int dsi_7nm_pll_restore_state(struct msm_dsi_phy *phy)
617617
static int dsi_7nm_set_usecase(struct msm_dsi_phy *phy)
618618
{
619619
struct dsi_pll_7nm *pll_7nm = to_pll_7nm(phy->vco_hw);
620-
void __iomem *base = phy->base;
621620
u32 data = 0x0; /* internal PLL */
622621

623622
DBG("DSI PLL%d", pll_7nm->phy->id);
@@ -636,7 +635,8 @@ static int dsi_7nm_set_usecase(struct msm_dsi_phy *phy)
636635
}
637636

638637
/* set PLL src */
639-
writel(data << 2, base + REG_DSI_7nm_PHY_CMN_CLK_CFG1);
638+
dsi_pll_cmn_clk_cfg1_update(pll_7nm, DSI_7nm_PHY_CMN_CLK_CFG1_BITCLK_SEL__MASK,
639+
DSI_7nm_PHY_CMN_CLK_CFG1_BITCLK_SEL(data));
640640

641641
return 0;
642642
}

drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
1616
<reg32 offset="0x00014" name="CLK_CFG1">
1717
<bitfield name="CLK_EN" pos="5" type="boolean"/>
1818
<bitfield name="CLK_EN_SEL" pos="4" type="boolean"/>
19+
<bitfield name="BITCLK_SEL" low="2" high="3" type="uint"/>
1920
</reg32>
2021
<reg32 offset="0x00018" name="GLBL_CTRL"/>
2122
<reg32 offset="0x0001c" name="RBUF_CTRL"/>

0 commit comments

Comments
 (0)