From: abhinavk@codeaurora.org
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
Jonathan Marek <jonathan@marek.ca>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
David Airlie <airlied@linux.ie>,
freedreno@lists.freedesktop.org, linux-clk@vger.kernel.org
Subject: Re: [PATCH v3 22/25] drm/msm/dsi: remove duplicate fields from dsi_pll_Nnm instances
Date: Mon, 29 Mar 2021 20:23:31 -0700 [thread overview]
Message-ID: <9b6df6e547d3a5f69342027e2b66d4db@codeaurora.org> (raw)
In-Reply-To: <20210327110305.3289784-23-dmitry.baryshkov@linaro.org>
On 2021-03-27 04:03, Dmitry Baryshkov wrote:
> Drop duplicate fields pdev and id from dsi_pll_Nnm instances. Reuse
> those fields from the provided msm_dsi_phy.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
> ---
> drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 72 +++++++++----------
> drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 54 +++++++-------
> drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 48 ++++++-------
> .../gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 26 +++----
> drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 68 ++++++++----------
> 5 files changed, 119 insertions(+), 149 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
> index 8a15ae91d44b..b937e77b3c37 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
> @@ -86,9 +86,6 @@ struct pll_10nm_cached_state {
> struct dsi_pll_10nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> u64 vco_ref_clk_rate;
> @@ -301,7 +298,7 @@ static int dsi_pll_10nm_vco_set_rate(struct clk_hw
> *hw, unsigned long rate,
> {
> struct dsi_pll_10nm *pll_10nm = to_pll_10nm(hw);
>
> - DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_10nm->id, rate,
> + DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_10nm->phy->id, rate,
> parent_rate);
>
> pll_10nm->vco_current_rate = rate;
> @@ -327,7 +324,7 @@ static int dsi_pll_10nm_vco_set_rate(struct clk_hw
> *hw, unsigned long rate,
>
> static int dsi_pll_10nm_lock_status(struct dsi_pll_10nm *pll)
> {
> - struct device *dev = &pll->pdev->dev;
> + struct device *dev = &pll->phy->pdev->dev;
> int rc;
> u32 status = 0;
> u32 const delay_us = 100;
> @@ -341,7 +338,7 @@ static int dsi_pll_10nm_lock_status(struct
> dsi_pll_10nm *pll)
> timeout_us);
> if (rc)
> DRM_DEV_ERROR(dev, "DSI PLL(%d) lock failed, status=0x%08x\n",
> - pll->id, status);
> + pll->phy->id, status);
>
> return rc;
> }
> @@ -387,7 +384,7 @@ static void dsi_pll_enable_global_clk(struct
> dsi_pll_10nm *pll)
> static int dsi_pll_10nm_vco_prepare(struct clk_hw *hw)
> {
> struct dsi_pll_10nm *pll_10nm = to_pll_10nm(hw);
> - struct device *dev = &pll_10nm->pdev->dev;
> + struct device *dev = &pll_10nm->phy->pdev->dev;
> int rc;
>
> dsi_pll_enable_pll_bias(pll_10nm);
> @@ -413,7 +410,7 @@ static int dsi_pll_10nm_vco_prepare(struct clk_hw
> *hw)
> /* Check for PLL lock */
> rc = dsi_pll_10nm_lock_status(pll_10nm);
> if (rc) {
> - DRM_DEV_ERROR(dev, "PLL(%d) lock failed\n", pll_10nm->id);
> + DRM_DEV_ERROR(dev, "PLL(%d) lock failed\n", pll_10nm->phy->id);
> goto error;
> }
>
> @@ -494,7 +491,7 @@ static unsigned long
> dsi_pll_10nm_vco_recalc_rate(struct clk_hw *hw,
> vco_rate = pll_freq;
>
> DBG("DSI PLL%d returning vco rate = %lu, dec = %x, frac = %x",
> - pll_10nm->id, (unsigned long)vco_rate, dec, frac);
> + pll_10nm->phy->id, (unsigned long)vco_rate, dec, frac);
>
> return (unsigned long)vco_rate;
> }
> @@ -543,7 +540,7 @@ static void dsi_10nm_save_state(struct msm_dsi_phy
> *phy)
> cached->pll_mux = cmn_clk_cfg1 & 0x3;
>
> DBG("DSI PLL%d outdiv %x bit_clk_div %x pix_clk_div %x pll_mux %x",
> - pll_10nm->id, cached->pll_out_div, cached->bit_clk_div,
> + pll_10nm->phy->id, cached->pll_out_div, cached->bit_clk_div,
> cached->pix_clk_div, cached->pll_mux);
> }
>
> @@ -570,12 +567,12 @@ static int dsi_10nm_restore_state(struct
> msm_dsi_phy *phy)
>
> ret = dsi_pll_10nm_vco_set_rate(phy->vco_hw,
> pll_10nm->vco_current_rate, pll_10nm->vco_ref_clk_rate);
> if (ret) {
> - DRM_DEV_ERROR(&pll_10nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_10nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
>
> - DBG("DSI PLL%d", pll_10nm->id);
> + DBG("DSI PLL%d", pll_10nm->phy->id);
>
> return 0;
> }
> @@ -586,13 +583,13 @@ static int dsi_10nm_set_usecase(struct
> msm_dsi_phy *phy)
> void __iomem *base = phy->base;
> u32 data = 0x0; /* internal PLL */
>
> - DBG("DSI PLL%d", pll_10nm->id);
> + DBG("DSI PLL%d", pll_10nm->phy->id);
>
> switch (phy->usecase) {
> case MSM_DSI_PHY_STANDALONE:
> break;
> case MSM_DSI_PHY_MASTER:
> - pll_10nm->slave = pll_10nm_list[(pll_10nm->id + 1) % DSI_MAX];
> + pll_10nm->slave = pll_10nm_list[(pll_10nm->phy->id + 1) % DSI_MAX];
> break;
> case MSM_DSI_PHY_SLAVE:
> data = 0x1; /* external PLL */
> @@ -624,21 +621,21 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> .flags = CLK_IGNORE_UNUSED,
> .ops = &clk_ops_dsi_pll_10nm_vco,
> };
> - struct device *dev = &pll_10nm->pdev->dev;
> + struct device *dev = &pll_10nm->phy->pdev->dev;
> struct clk_hw *hw;
> int ret;
>
> - DBG("DSI%d", pll_10nm->id);
> + DBG("DSI%d", pll_10nm->phy->id);
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_10nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_10nm->phy->id);
> pll_10nm->clk_hw.init = &vco_init;
>
> ret = devm_clk_hw_register(dev, &pll_10nm->clk_hw);
> if (ret)
> return ret;
>
> - snprintf(clk_name, 32, "dsi%d_pll_out_div_clk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%dvco_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_out_div_clk", pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%dvco_clk", pll_10nm->phy->id);
>
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent, CLK_SET_RATE_PARENT,
> @@ -650,8 +647,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pll_bit_clk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_bit_clk", pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_10nm->phy->id);
>
> /* BIT CLK: DIV_CTRL_3_0 */
> hw = devm_clk_hw_register_divider(dev, clk_name, parent,
> @@ -665,8 +662,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk",
> pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->phy->id);
>
> /* DSI Byte clock = VCO_CLK / OUT_DIV / BIT_DIV / 8 */
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> @@ -678,8 +675,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
>
> provided_clocks[DSI_BYTE_PLL_CLK] = hw;
>
> - snprintf(clk_name, 32, "dsi%d_pll_by_2_bit_clk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_by_2_bit_clk", pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->phy->id);
>
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> 0, 1, 2);
> @@ -688,8 +685,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pll_post_out_div_clk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_post_out_div_clk",
> pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_10nm->phy->id);
>
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> 0, 1, 4);
> @@ -698,11 +695,11 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pclk_mux", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->id);
> - snprintf(parent2, 32, "dsi%d_pll_by_2_bit_clk", pll_10nm->id);
> - snprintf(parent3, 32, "dsi%d_pll_out_div_clk", pll_10nm->id);
> - snprintf(parent4, 32, "dsi%d_pll_post_out_div_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pclk_mux", pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->phy->id);
> + snprintf(parent2, 32, "dsi%d_pll_by_2_bit_clk", pll_10nm->phy->id);
> + snprintf(parent3, 32, "dsi%d_pll_out_div_clk", pll_10nm->phy->id);
> + snprintf(parent4, 32, "dsi%d_pll_post_out_div_clk",
> pll_10nm->phy->id);
>
> hw = devm_clk_hw_register_mux(dev, clk_name,
> ((const char *[]){
> @@ -715,8 +712,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pclk_mux", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk",
> pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pclk_mux", pll_10nm->phy->id);
>
> /* PIX CLK DIV : DIV_CTRL_7_4*/
> hw = devm_clk_hw_register_divider(dev, clk_name, parent,
> @@ -741,7 +738,6 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> static int dsi_pll_10nm_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_10nm *pll_10nm;
> int ret;
>
> @@ -749,11 +745,9 @@ static int dsi_pll_10nm_init(struct msm_dsi_phy
> *phy)
> if (!pll_10nm)
> return -ENOMEM;
>
> - DBG("DSI PLL%d", id);
> + DBG("DSI PLL%d", phy->id);
>
> - pll_10nm->pdev = pdev;
> - pll_10nm->id = id;
> - pll_10nm_list[id] = pll_10nm;
> + pll_10nm_list[phy->id] = pll_10nm;
>
> spin_lock_init(&pll_10nm->postdiv_lock);
>
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
> index 5a92c2c1e815..8b4865c5796d 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
> @@ -115,9 +115,6 @@ struct pll_14nm_cached_state {
> struct dsi_pll_14nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> struct dsi_pll_input in;
> @@ -498,7 +495,7 @@ static void pll_db_commit_14nm(struct dsi_pll_14nm
> *pll,
> void __iomem *cmn_base = pll->phy->base;
> u8 data;
>
> - DBG("DSI%d PLL", pll->id);
> + DBG("DSI%d PLL", pll->phy->id);
>
> data = pout->cmn_ldo_cntrl;
> dsi_phy_write(cmn_base + REG_DSI_14nm_PHY_CMN_LDO_CNTRL, data);
> @@ -565,7 +562,7 @@ static int dsi_pll_14nm_vco_set_rate(struct clk_hw
> *hw, unsigned long rate,
> struct dsi_pll_input *pin = &pll_14nm->in;
> struct dsi_pll_output *pout = &pll_14nm->out;
>
> - DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_14nm->id, rate,
> + DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_14nm->phy->id, rate,
> parent_rate);
>
> pll_14nm->vco_current_rate = rate;
> @@ -666,7 +663,7 @@ static int dsi_pll_14nm_vco_prepare(struct clk_hw
> *hw)
> POLL_TIMEOUT_US);
>
> if (unlikely(!locked)) {
> - DRM_DEV_ERROR(&pll_14nm->pdev->dev, "DSI PLL lock failed\n");
> + DRM_DEV_ERROR(&pll_14nm->phy->pdev->dev, "DSI PLL lock failed\n");
> return -EINVAL;
> }
>
> @@ -726,7 +723,7 @@ static unsigned long
> dsi_pll_14nm_postdiv_recalc_rate(struct clk_hw *hw,
> u8 width = postdiv->width;
> u32 val;
>
> - DBG("DSI%d PLL parent rate=%lu", pll_14nm->id, parent_rate);
> + DBG("DSI%d PLL parent rate=%lu", pll_14nm->phy->id, parent_rate);
>
> val = dsi_phy_read(base + REG_DSI_14nm_PHY_CMN_CLK_CFG0) >> shift;
> val &= div_mask(width);
> @@ -742,7 +739,7 @@ static long dsi_pll_14nm_postdiv_round_rate(struct
> clk_hw *hw,
> struct dsi_pll_14nm_postdiv *postdiv = to_pll_14nm_postdiv(hw);
> struct dsi_pll_14nm *pll_14nm = postdiv->pll;
>
> - DBG("DSI%d PLL parent rate=%lu", pll_14nm->id, rate);
> + DBG("DSI%d PLL parent rate=%lu", pll_14nm->phy->id, rate);
>
> return divider_round_rate(hw, rate, prate, NULL,
> postdiv->width,
> @@ -762,7 +759,7 @@ static int dsi_pll_14nm_postdiv_set_rate(struct
> clk_hw *hw, unsigned long rate,
> unsigned long flags = 0;
> u32 val;
>
> - DBG("DSI%d PLL parent rate=%lu parent rate %lu", pll_14nm->id, rate,
> + DBG("DSI%d PLL parent rate=%lu parent rate %lu", pll_14nm->phy->id,
> rate,
> parent_rate);
>
> value = divider_get_val(rate, parent_rate, NULL, postdiv->width,
> @@ -813,7 +810,7 @@ static void dsi_14nm_save_state(struct msm_dsi_phy
> *phy)
> cached_state->n1postdiv = data & 0xf;
> cached_state->n2postdiv = (data >> 4) & 0xf;
>
> - DBG("DSI%d PLL save state %x %x", pll_14nm->id,
> + DBG("DSI%d PLL save state %x %x", pll_14nm->phy->id,
> cached_state->n1postdiv, cached_state->n2postdiv);
>
> cached_state->vco_rate = clk_hw_get_rate(phy->vco_hw);
> @@ -830,14 +827,14 @@ static int dsi_14nm_restore_state(struct
> msm_dsi_phy *phy)
> ret = dsi_pll_14nm_vco_set_rate(phy->vco_hw,
> cached_state->vco_rate, 0);
> if (ret) {
> - DRM_DEV_ERROR(&pll_14nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_14nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
>
> data = cached_state->n1postdiv | (cached_state->n2postdiv << 4);
>
> - DBG("DSI%d PLL restore state %x %x", pll_14nm->id,
> + DBG("DSI%d PLL restore state %x %x", pll_14nm->phy->id,
> cached_state->n1postdiv, cached_state->n2postdiv);
>
> dsi_phy_write(cmn_base + REG_DSI_14nm_PHY_CMN_CLK_CFG0, data);
> @@ -865,7 +862,7 @@ static int dsi_14nm_set_usecase(struct msm_dsi_phy
> *phy)
> break;
> case MSM_DSI_PHY_MASTER:
> clkbuflr_en = 0x3;
> - pll_14nm->slave = pll_14nm_list[(pll_14nm->id + 1) % DSI_MAX];
> + pll_14nm->slave = pll_14nm_list[(pll_14nm->phy->id + 1) % DSI_MAX];
> break;
> case MSM_DSI_PHY_SLAVE:
> clkbuflr_en = 0x0;
> @@ -889,7 +886,7 @@ static struct clk_hw
> *pll_14nm_postdiv_register(struct dsi_pll_14nm *pll_14nm,
> u8 shift)
> {
> struct dsi_pll_14nm_postdiv *pll_postdiv;
> - struct device *dev = &pll_14nm->pdev->dev;
> + struct device *dev = &pll_14nm->phy->pdev->dev;
> struct clk_init_data postdiv_init = {
> .parent_names = (const char *[]) { parent_name },
> .num_parents = 1,
> @@ -928,21 +925,21 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
> .flags = CLK_IGNORE_UNUSED,
> .ops = &clk_ops_dsi_pll_14nm_vco,
> };
> - struct device *dev = &pll_14nm->pdev->dev;
> + struct device *dev = &pll_14nm->phy->pdev->dev;
> struct clk_hw *hw;
> int ret;
>
> - DBG("DSI%d", pll_14nm->id);
> + DBG("DSI%d", pll_14nm->phy->id);
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_14nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_14nm->phy->id);
> pll_14nm->clk_hw.init = &vco_init;
>
> ret = devm_clk_hw_register(dev, &pll_14nm->clk_hw);
> if (ret)
> return ret;
>
> - snprintf(clk_name, 32, "dsi%dn1_postdiv_clk", pll_14nm->id);
> - snprintf(parent, 32, "dsi%dvco_clk", pll_14nm->id);
> + snprintf(clk_name, 32, "dsi%dn1_postdiv_clk", pll_14nm->phy->id);
> + snprintf(parent, 32, "dsi%dvco_clk", pll_14nm->phy->id);
>
> /* N1 postdiv, bits 0-3 in REG_DSI_14nm_PHY_CMN_CLK_CFG0 */
> hw = pll_14nm_postdiv_register(pll_14nm, clk_name, parent,
> @@ -950,8 +947,8 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dpllbyte", pll_14nm->id);
> - snprintf(parent, 32, "dsi%dn1_postdiv_clk", pll_14nm->id);
> + snprintf(clk_name, 32, "dsi%dpllbyte", pll_14nm->phy->id);
> + snprintf(parent, 32, "dsi%dn1_postdiv_clk", pll_14nm->phy->id);
>
> /* DSI Byte clock = VCO_CLK / N1 / 8 */
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> @@ -961,8 +958,8 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
>
> provided_clocks[DSI_BYTE_PLL_CLK] = hw;
>
> - snprintf(clk_name, 32, "dsi%dn1_postdivby2_clk", pll_14nm->id);
> - snprintf(parent, 32, "dsi%dn1_postdiv_clk", pll_14nm->id);
> + snprintf(clk_name, 32, "dsi%dn1_postdivby2_clk", pll_14nm->phy->id);
> + snprintf(parent, 32, "dsi%dn1_postdiv_clk", pll_14nm->phy->id);
>
> /*
> * Skip the mux for now, force DSICLK_SEL to 1, Add a /2 divider
> @@ -972,8 +969,8 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dpll", pll_14nm->id);
> - snprintf(parent, 32, "dsi%dn1_postdivby2_clk", pll_14nm->id);
> + snprintf(clk_name, 32, "dsi%dpll", pll_14nm->phy->id);
> + snprintf(parent, 32, "dsi%dn1_postdivby2_clk", pll_14nm->phy->id);
>
> /* DSI pixel clock = VCO_CLK / N1 / 2 / N2
> * This is the output of N2 post-divider, bits 4-7 in
> @@ -991,7 +988,6 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
> static int dsi_pll_14nm_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_14nm *pll_14nm;
> int ret;
>
> @@ -1002,11 +998,9 @@ static int dsi_pll_14nm_init(struct msm_dsi_phy
> *phy)
> if (!pll_14nm)
> return -ENOMEM;
>
> - DBG("PLL%d", id);
> + DBG("PLL%d", phy->id);
>
> - pll_14nm->pdev = pdev;
> - pll_14nm->id = id;
> - pll_14nm_list[id] = pll_14nm;
> + pll_14nm_list[phy->id] = pll_14nm;
>
> spin_lock_init(&pll_14nm->postdiv_lock);
>
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
> index bdb117938bcc..0bcea3f3eca3 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
> @@ -67,9 +67,6 @@ struct pll_28nm_cached_state {
> struct dsi_pll_28nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> struct pll_28nm_cached_state cached_state;
> @@ -117,7 +114,7 @@ static int dsi_pll_28nm_clk_set_rate(struct clk_hw
> *hw, unsigned long rate,
> unsigned long parent_rate)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> void __iomem *base = pll_28nm->phy->pll_base;
> unsigned long div_fbx1000, gen_vco_clk;
> u32 refclk_cfg, frac_n_mode, frac_n_value;
> @@ -288,14 +285,14 @@ static unsigned long
> dsi_pll_28nm_clk_recalc_rate(struct clk_hw *hw,
>
> static int _dsi_pll_28nm_vco_prepare_hpm(struct dsi_pll_28nm
> *pll_28nm)
> {
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> void __iomem *base = pll_28nm->phy->pll_base;
> u32 max_reads = 5, timeout_us = 100;
> bool locked;
> u32 val;
> int i;
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> pll_28nm_software_reset(pll_28nm);
>
> @@ -382,13 +379,13 @@ static int dsi_pll_28nm_vco_prepare_hpm(struct
> clk_hw *hw)
> static int dsi_pll_28nm_vco_prepare_lp(struct clk_hw *hw)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> void __iomem *base = pll_28nm->phy->pll_base;
> bool locked;
> u32 max_reads = 10, timeout_us = 50;
> u32 val;
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> if (unlikely(pll_28nm->phy->pll_on))
> return 0;
> @@ -432,7 +429,7 @@ static void dsi_pll_28nm_vco_unprepare(struct
> clk_hw *hw)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> if (unlikely(!pll_28nm->phy->pll_on))
> return;
> @@ -504,7 +501,7 @@ static int dsi_28nm_restore_state(struct
> msm_dsi_phy *phy)
> ret = dsi_pll_28nm_clk_set_rate(phy->vco_hw,
> cached_state->vco_rate, 0);
> if (ret) {
> - DRM_DEV_ERROR(&pll_28nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_28nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
> @@ -528,25 +525,25 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> .name = vco_name,
> .flags = CLK_IGNORE_UNUSED,
> };
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> struct clk_hw *hw;
> int ret;
>
> - DBG("%d", pll_28nm->id);
> + DBG("%d", pll_28nm->phy->id);
>
> if (pll_28nm->phy->cfg->quirks & DSI_PHY_28NM_QUIRK_PHY_LP)
> vco_init.ops = &clk_ops_dsi_pll_28nm_vco_lp;
> else
> vco_init.ops = &clk_ops_dsi_pll_28nm_vco_hpm;
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_28nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> pll_28nm->clk_hw.init = &vco_init;
> ret = devm_clk_hw_register(dev, &pll_28nm->clk_hw);
> if (ret)
> return ret;
>
> - snprintf(clk_name, 32, "dsi%danalog_postdiv_clk", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%danalog_postdiv_clk", pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent1, CLK_SET_RATE_PARENT,
> pll_28nm->phy->pll_base +
> @@ -555,16 +552,16 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dindirect_path_div2_clk", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%danalog_postdiv_clk", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dindirect_path_div2_clk",
> pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%danalog_postdiv_clk", pll_28nm->phy->id);
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name,
> parent1, CLK_SET_RATE_PARENT,
> 1, 2);
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dpll", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dpll", pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent1, 0, pll_28nm->phy->pll_base +
> REG_DSI_28nm_PHY_PLL_POSTDIV3_CFG,
> @@ -573,9 +570,9 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> return PTR_ERR(hw);
> provided_clocks[DSI_PIXEL_PLL_CLK] = hw;
>
> - snprintf(clk_name, 32, "dsi%dbyte_mux", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->id);
> - snprintf(parent2, 32, "dsi%dindirect_path_div2_clk", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dbyte_mux", pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> + snprintf(parent2, 32, "dsi%dindirect_path_div2_clk",
> pll_28nm->phy->id);
> hw = devm_clk_hw_register_mux(dev, clk_name,
> ((const char *[]){
> parent1, parent2
> @@ -584,8 +581,8 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%dbyte_mux", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%dbyte_mux", pll_28nm->phy->id);
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name,
> parent1, CLK_SET_RATE_PARENT, 1, 4);
> if (IS_ERR(hw))
> @@ -598,7 +595,6 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> static int dsi_pll_28nm_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_28nm *pll_28nm;
> int ret;
>
> @@ -609,8 +605,6 @@ static int dsi_pll_28nm_init(struct msm_dsi_phy
> *phy)
> if (!pll_28nm)
> return -ENOMEM;
>
> - pll_28nm->pdev = pdev;
> - pll_28nm->id = id;
> pll_28nm->phy = phy;
>
> ret = pll_28nm_register(pll_28nm, phy->provided_clocks->hws);
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c
> index 36ee3f15d1e0..9ddd0adccce3 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c
> @@ -59,9 +59,6 @@ struct clk_bytediv {
> struct dsi_pll_28nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> struct pll_28nm_cached_state cached_state;
> @@ -178,14 +175,14 @@ static unsigned long
> dsi_pll_28nm_clk_recalc_rate(struct clk_hw *hw,
> static int dsi_pll_28nm_vco_prepare(struct clk_hw *hw)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> void __iomem *base = pll_28nm->phy->pll_base;
> bool locked;
> unsigned int bit_div, byte_div;
> int max_reads = 1000, timeout_us = 100;
> u32 val;
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> if (unlikely(pll_28nm->phy->pll_on))
> return 0;
> @@ -227,7 +224,7 @@ static void dsi_pll_28nm_vco_unprepare(struct
> clk_hw *hw)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> if (unlikely(!pll_28nm->phy->pll_on))
> return;
> @@ -368,7 +365,7 @@ static int dsi_28nm_restore_state(struct
> msm_dsi_phy *phy)
> ret = dsi_pll_28nm_clk_set_rate(phy->vco_hw,
> cached_state->vco_rate, 0);
> if (ret) {
> - DRM_DEV_ERROR(&pll_28nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_28nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
> @@ -392,13 +389,13 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> .flags = CLK_IGNORE_UNUSED,
> .ops = &clk_ops_dsi_pll_28nm_vco,
> };
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> struct clk_hw *hw;
> struct clk_bytediv *bytediv;
> struct clk_init_data bytediv_init = { };
> int ret;
>
> - DBG("%d", pll_28nm->id);
> + DBG("%d", pll_28nm->phy->id);
>
> bytediv = devm_kzalloc(dev, sizeof(*bytediv), GFP_KERNEL);
> if (!bytediv)
> @@ -412,7 +409,7 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> if (!clk_name)
> return -ENOMEM;
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_28nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> vco_init.name = vco_name;
>
> pll_28nm->clk_hw.init = &vco_init;
> @@ -425,8 +422,8 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> bytediv->hw.init = &bytediv_init;
> bytediv->reg = pll_28nm->phy->pll_base +
> REG_DSI_28nm_8960_PHY_PLL_CTRL_9;
>
> - snprintf(parent_name, 32, "dsi%dvco_clk", pll_28nm->id);
> - snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->id);
> + snprintf(parent_name, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> + snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->phy->id);
>
> bytediv_init.name = clk_name;
> bytediv_init.ops = &clk_bytediv_ops;
> @@ -440,7 +437,7 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> return ret;
> provided_clocks[DSI_BYTE_PLL_CLK] = &bytediv->hw;
>
> - snprintf(clk_name, 32, "dsi%dpll", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dpll", pll_28nm->phy->id);
> /* DIV3 */
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent_name, 0, pll_28nm->phy->pll_base +
> @@ -456,7 +453,6 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> static int dsi_pll_28nm_8960_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_28nm *pll_28nm;
> int ret;
>
> @@ -467,8 +463,6 @@ static int dsi_pll_28nm_8960_init(struct
> msm_dsi_phy *phy)
> if (!pll_28nm)
> return -ENOMEM;
>
> - pll_28nm->pdev = pdev;
> - pll_28nm->id = id + 1;
> pll_28nm->phy = phy;
>
> ret = pll_28nm_register(pll_28nm, phy->provided_clocks->hws);
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
> index 8e8cf9e63e8f..4df237ad0eaf 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
> @@ -86,9 +86,6 @@ struct pll_7nm_cached_state {
> struct dsi_pll_7nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> u64 vco_ref_clk_rate;
> @@ -320,7 +317,7 @@ static int dsi_pll_7nm_vco_set_rate(struct clk_hw
> *hw, unsigned long rate,
> {
> struct dsi_pll_7nm *pll_7nm = to_pll_7nm(hw);
>
> - DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_7nm->id, rate,
> + DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_7nm->phy->id, rate,
> parent_rate);
>
> pll_7nm->vco_current_rate = rate;
> @@ -359,7 +356,7 @@ static int dsi_pll_7nm_lock_status(struct
> dsi_pll_7nm *pll)
> timeout_us);
> if (rc)
> pr_err("DSI PLL(%d) lock failed, status=0x%08x\n",
> - pll->id, status);
> + pll->phy->id, status);
>
> return rc;
> }
> @@ -435,7 +432,7 @@ static int dsi_pll_7nm_vco_prepare(struct clk_hw
> *hw)
> /* Check for PLL lock */
> rc = dsi_pll_7nm_lock_status(pll_7nm);
> if (rc) {
> - pr_err("PLL(%d) lock failed\n", pll_7nm->id);
> + pr_err("PLL(%d) lock failed\n", pll_7nm->phy->id);
> goto error;
> }
>
> @@ -519,7 +516,7 @@ static unsigned long
> dsi_pll_7nm_vco_recalc_rate(struct clk_hw *hw,
> vco_rate = pll_freq;
>
> DBG("DSI PLL%d returning vco rate = %lu, dec = %x, frac = %x",
> - pll_7nm->id, (unsigned long)vco_rate, dec, frac);
> + pll_7nm->phy->id, (unsigned long)vco_rate, dec, frac);
>
> return (unsigned long)vco_rate;
> }
> @@ -568,7 +565,7 @@ static void dsi_7nm_save_state(struct msm_dsi_phy
> *phy)
> cached->pll_mux = cmn_clk_cfg1 & 0x3;
>
> DBG("DSI PLL%d outdiv %x bit_clk_div %x pix_clk_div %x pll_mux %x",
> - pll_7nm->id, cached->pll_out_div, cached->bit_clk_div,
> + pll_7nm->phy->id, cached->pll_out_div, cached->bit_clk_div,
> cached->pix_clk_div, cached->pll_mux);
> }
>
> @@ -595,12 +592,12 @@ static int dsi_7nm_restore_state(struct
> msm_dsi_phy *phy)
>
> ret = dsi_pll_7nm_vco_set_rate(phy->vco_hw,
> pll_7nm->vco_current_rate, pll_7nm->vco_ref_clk_rate);
> if (ret) {
> - DRM_DEV_ERROR(&pll_7nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_7nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
>
> - DBG("DSI PLL%d", pll_7nm->id);
> + DBG("DSI PLL%d", pll_7nm->phy->id);
>
> return 0;
> }
> @@ -611,13 +608,13 @@ static int dsi_7nm_set_usecase(struct msm_dsi_phy
> *phy)
> void __iomem *base = phy->base;
> u32 data = 0x0; /* internal PLL */
>
> - DBG("DSI PLL%d", pll_7nm->id);
> + DBG("DSI PLL%d", pll_7nm->phy->id);
>
> switch (phy->usecase) {
> case MSM_DSI_PHY_STANDALONE:
> break;
> case MSM_DSI_PHY_MASTER:
> - pll_7nm->slave = pll_7nm_list[(pll_7nm->id + 1) % DSI_MAX];
> + pll_7nm->slave = pll_7nm_list[(pll_7nm->phy->id + 1) % DSI_MAX];
> break;
> case MSM_DSI_PHY_SLAVE:
> data = 0x1; /* external PLL */
> @@ -649,21 +646,21 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> .flags = CLK_IGNORE_UNUSED,
> .ops = &clk_ops_dsi_pll_7nm_vco,
> };
> - struct device *dev = &pll_7nm->pdev->dev;
> + struct device *dev = &pll_7nm->phy->pdev->dev;
> struct clk_hw *hw;
> int ret;
>
> - DBG("DSI%d", pll_7nm->id);
> + DBG("DSI%d", pll_7nm->phy->id);
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_7nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_7nm->phy->id);
> pll_7nm->clk_hw.init = &vco_init;
>
> ret = devm_clk_hw_register(dev, &pll_7nm->clk_hw);
> if (ret)
> return ret;
>
> - snprintf(clk_name, 32, "dsi%d_pll_out_div_clk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%dvco_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_out_div_clk", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%dvco_clk", pll_7nm->phy->id);
>
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent, CLK_SET_RATE_PARENT,
> @@ -675,8 +672,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pll_bit_clk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_bit_clk", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_7nm->phy->id);
>
> /* BIT CLK: DIV_CTRL_3_0 */
> hw = devm_clk_hw_register_divider(dev, clk_name, parent,
> @@ -690,8 +687,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk",
> pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->phy->id);
>
> /* DSI Byte clock = VCO_CLK / OUT_DIV / BIT_DIV / 8 */
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> @@ -703,8 +700,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
>
> provided_clocks[DSI_BYTE_PLL_CLK] = hw;
>
> - snprintf(clk_name, 32, "dsi%d_pll_by_2_bit_clk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_by_2_bit_clk", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->phy->id);
>
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> 0, 1, 2);
> @@ -713,8 +710,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pll_post_out_div_clk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_post_out_div_clk",
> pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_7nm->phy->id);
>
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> 0, 1, 4);
> @@ -723,11 +720,11 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pclk_mux", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->id);
> - snprintf(parent2, 32, "dsi%d_pll_by_2_bit_clk", pll_7nm->id);
> - snprintf(parent3, 32, "dsi%d_pll_out_div_clk", pll_7nm->id);
> - snprintf(parent4, 32, "dsi%d_pll_post_out_div_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pclk_mux", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->phy->id);
> + snprintf(parent2, 32, "dsi%d_pll_by_2_bit_clk", pll_7nm->phy->id);
> + snprintf(parent3, 32, "dsi%d_pll_out_div_clk", pll_7nm->phy->id);
> + snprintf(parent4, 32, "dsi%d_pll_post_out_div_clk",
> pll_7nm->phy->id);
>
> hw = devm_clk_hw_register_mux(dev, clk_name,
> ((const char *[]){
> @@ -740,8 +737,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pclk_mux", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pclk_mux", pll_7nm->phy->id);
>
> /* PIX CLK DIV : DIV_CTRL_7_4*/
> hw = devm_clk_hw_register_divider(dev, clk_name, parent,
> @@ -766,7 +763,6 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> static int dsi_pll_7nm_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_7nm *pll_7nm;
> int ret;
>
> @@ -774,11 +770,9 @@ static int dsi_pll_7nm_init(struct msm_dsi_phy
> *phy)
> if (!pll_7nm)
> return -ENOMEM;
>
> - DBG("DSI PLL%d", id);
> + DBG("DSI PLL%d", phy->id);
>
> - pll_7nm->pdev = pdev;
> - pll_7nm->id = id;
> - pll_7nm_list[id] = pll_7nm;
> + pll_7nm_list[phy->id] = pll_7nm;
>
> spin_lock_init(&pll_7nm->postdiv_lock);
WARNING: multiple messages have this Message-ID (diff)
From: abhinavk@codeaurora.org
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: freedreno@lists.freedesktop.org,
Jonathan Marek <jonathan@marek.ca>,
Stephen Boyd <sboyd@kernel.org>,
linux-arm-msm@vger.kernel.org,
Michael Turquette <mturquette@baylibre.com>,
dri-devel@lists.freedesktop.org, David Airlie <airlied@linux.ie>,
Sean Paul <sean@poorly.run>,
linux-clk@vger.kernel.org
Subject: Re: [PATCH v3 22/25] drm/msm/dsi: remove duplicate fields from dsi_pll_Nnm instances
Date: Mon, 29 Mar 2021 20:23:31 -0700 [thread overview]
Message-ID: <9b6df6e547d3a5f69342027e2b66d4db@codeaurora.org> (raw)
In-Reply-To: <20210327110305.3289784-23-dmitry.baryshkov@linaro.org>
On 2021-03-27 04:03, Dmitry Baryshkov wrote:
> Drop duplicate fields pdev and id from dsi_pll_Nnm instances. Reuse
> those fields from the provided msm_dsi_phy.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
> ---
> drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 72 +++++++++----------
> drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 54 +++++++-------
> drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 48 ++++++-------
> .../gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 26 +++----
> drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 68 ++++++++----------
> 5 files changed, 119 insertions(+), 149 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
> index 8a15ae91d44b..b937e77b3c37 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
> @@ -86,9 +86,6 @@ struct pll_10nm_cached_state {
> struct dsi_pll_10nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> u64 vco_ref_clk_rate;
> @@ -301,7 +298,7 @@ static int dsi_pll_10nm_vco_set_rate(struct clk_hw
> *hw, unsigned long rate,
> {
> struct dsi_pll_10nm *pll_10nm = to_pll_10nm(hw);
>
> - DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_10nm->id, rate,
> + DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_10nm->phy->id, rate,
> parent_rate);
>
> pll_10nm->vco_current_rate = rate;
> @@ -327,7 +324,7 @@ static int dsi_pll_10nm_vco_set_rate(struct clk_hw
> *hw, unsigned long rate,
>
> static int dsi_pll_10nm_lock_status(struct dsi_pll_10nm *pll)
> {
> - struct device *dev = &pll->pdev->dev;
> + struct device *dev = &pll->phy->pdev->dev;
> int rc;
> u32 status = 0;
> u32 const delay_us = 100;
> @@ -341,7 +338,7 @@ static int dsi_pll_10nm_lock_status(struct
> dsi_pll_10nm *pll)
> timeout_us);
> if (rc)
> DRM_DEV_ERROR(dev, "DSI PLL(%d) lock failed, status=0x%08x\n",
> - pll->id, status);
> + pll->phy->id, status);
>
> return rc;
> }
> @@ -387,7 +384,7 @@ static void dsi_pll_enable_global_clk(struct
> dsi_pll_10nm *pll)
> static int dsi_pll_10nm_vco_prepare(struct clk_hw *hw)
> {
> struct dsi_pll_10nm *pll_10nm = to_pll_10nm(hw);
> - struct device *dev = &pll_10nm->pdev->dev;
> + struct device *dev = &pll_10nm->phy->pdev->dev;
> int rc;
>
> dsi_pll_enable_pll_bias(pll_10nm);
> @@ -413,7 +410,7 @@ static int dsi_pll_10nm_vco_prepare(struct clk_hw
> *hw)
> /* Check for PLL lock */
> rc = dsi_pll_10nm_lock_status(pll_10nm);
> if (rc) {
> - DRM_DEV_ERROR(dev, "PLL(%d) lock failed\n", pll_10nm->id);
> + DRM_DEV_ERROR(dev, "PLL(%d) lock failed\n", pll_10nm->phy->id);
> goto error;
> }
>
> @@ -494,7 +491,7 @@ static unsigned long
> dsi_pll_10nm_vco_recalc_rate(struct clk_hw *hw,
> vco_rate = pll_freq;
>
> DBG("DSI PLL%d returning vco rate = %lu, dec = %x, frac = %x",
> - pll_10nm->id, (unsigned long)vco_rate, dec, frac);
> + pll_10nm->phy->id, (unsigned long)vco_rate, dec, frac);
>
> return (unsigned long)vco_rate;
> }
> @@ -543,7 +540,7 @@ static void dsi_10nm_save_state(struct msm_dsi_phy
> *phy)
> cached->pll_mux = cmn_clk_cfg1 & 0x3;
>
> DBG("DSI PLL%d outdiv %x bit_clk_div %x pix_clk_div %x pll_mux %x",
> - pll_10nm->id, cached->pll_out_div, cached->bit_clk_div,
> + pll_10nm->phy->id, cached->pll_out_div, cached->bit_clk_div,
> cached->pix_clk_div, cached->pll_mux);
> }
>
> @@ -570,12 +567,12 @@ static int dsi_10nm_restore_state(struct
> msm_dsi_phy *phy)
>
> ret = dsi_pll_10nm_vco_set_rate(phy->vco_hw,
> pll_10nm->vco_current_rate, pll_10nm->vco_ref_clk_rate);
> if (ret) {
> - DRM_DEV_ERROR(&pll_10nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_10nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
>
> - DBG("DSI PLL%d", pll_10nm->id);
> + DBG("DSI PLL%d", pll_10nm->phy->id);
>
> return 0;
> }
> @@ -586,13 +583,13 @@ static int dsi_10nm_set_usecase(struct
> msm_dsi_phy *phy)
> void __iomem *base = phy->base;
> u32 data = 0x0; /* internal PLL */
>
> - DBG("DSI PLL%d", pll_10nm->id);
> + DBG("DSI PLL%d", pll_10nm->phy->id);
>
> switch (phy->usecase) {
> case MSM_DSI_PHY_STANDALONE:
> break;
> case MSM_DSI_PHY_MASTER:
> - pll_10nm->slave = pll_10nm_list[(pll_10nm->id + 1) % DSI_MAX];
> + pll_10nm->slave = pll_10nm_list[(pll_10nm->phy->id + 1) % DSI_MAX];
> break;
> case MSM_DSI_PHY_SLAVE:
> data = 0x1; /* external PLL */
> @@ -624,21 +621,21 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> .flags = CLK_IGNORE_UNUSED,
> .ops = &clk_ops_dsi_pll_10nm_vco,
> };
> - struct device *dev = &pll_10nm->pdev->dev;
> + struct device *dev = &pll_10nm->phy->pdev->dev;
> struct clk_hw *hw;
> int ret;
>
> - DBG("DSI%d", pll_10nm->id);
> + DBG("DSI%d", pll_10nm->phy->id);
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_10nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_10nm->phy->id);
> pll_10nm->clk_hw.init = &vco_init;
>
> ret = devm_clk_hw_register(dev, &pll_10nm->clk_hw);
> if (ret)
> return ret;
>
> - snprintf(clk_name, 32, "dsi%d_pll_out_div_clk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%dvco_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_out_div_clk", pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%dvco_clk", pll_10nm->phy->id);
>
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent, CLK_SET_RATE_PARENT,
> @@ -650,8 +647,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pll_bit_clk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_bit_clk", pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_10nm->phy->id);
>
> /* BIT CLK: DIV_CTRL_3_0 */
> hw = devm_clk_hw_register_divider(dev, clk_name, parent,
> @@ -665,8 +662,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk",
> pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->phy->id);
>
> /* DSI Byte clock = VCO_CLK / OUT_DIV / BIT_DIV / 8 */
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> @@ -678,8 +675,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
>
> provided_clocks[DSI_BYTE_PLL_CLK] = hw;
>
> - snprintf(clk_name, 32, "dsi%d_pll_by_2_bit_clk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_by_2_bit_clk", pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->phy->id);
>
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> 0, 1, 2);
> @@ -688,8 +685,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pll_post_out_div_clk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_post_out_div_clk",
> pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_10nm->phy->id);
>
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> 0, 1, 4);
> @@ -698,11 +695,11 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pclk_mux", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->id);
> - snprintf(parent2, 32, "dsi%d_pll_by_2_bit_clk", pll_10nm->id);
> - snprintf(parent3, 32, "dsi%d_pll_out_div_clk", pll_10nm->id);
> - snprintf(parent4, 32, "dsi%d_pll_post_out_div_clk", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_pclk_mux", pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->phy->id);
> + snprintf(parent2, 32, "dsi%d_pll_by_2_bit_clk", pll_10nm->phy->id);
> + snprintf(parent3, 32, "dsi%d_pll_out_div_clk", pll_10nm->phy->id);
> + snprintf(parent4, 32, "dsi%d_pll_post_out_div_clk",
> pll_10nm->phy->id);
>
> hw = devm_clk_hw_register_mux(dev, clk_name,
> ((const char *[]){
> @@ -715,8 +712,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk", pll_10nm->id);
> - snprintf(parent, 32, "dsi%d_pclk_mux", pll_10nm->id);
> + snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk",
> pll_10nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pclk_mux", pll_10nm->phy->id);
>
> /* PIX CLK DIV : DIV_CTRL_7_4*/
> hw = devm_clk_hw_register_divider(dev, clk_name, parent,
> @@ -741,7 +738,6 @@ static int pll_10nm_register(struct dsi_pll_10nm
> *pll_10nm, struct clk_hw **prov
> static int dsi_pll_10nm_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_10nm *pll_10nm;
> int ret;
>
> @@ -749,11 +745,9 @@ static int dsi_pll_10nm_init(struct msm_dsi_phy
> *phy)
> if (!pll_10nm)
> return -ENOMEM;
>
> - DBG("DSI PLL%d", id);
> + DBG("DSI PLL%d", phy->id);
>
> - pll_10nm->pdev = pdev;
> - pll_10nm->id = id;
> - pll_10nm_list[id] = pll_10nm;
> + pll_10nm_list[phy->id] = pll_10nm;
>
> spin_lock_init(&pll_10nm->postdiv_lock);
>
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
> index 5a92c2c1e815..8b4865c5796d 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
> @@ -115,9 +115,6 @@ struct pll_14nm_cached_state {
> struct dsi_pll_14nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> struct dsi_pll_input in;
> @@ -498,7 +495,7 @@ static void pll_db_commit_14nm(struct dsi_pll_14nm
> *pll,
> void __iomem *cmn_base = pll->phy->base;
> u8 data;
>
> - DBG("DSI%d PLL", pll->id);
> + DBG("DSI%d PLL", pll->phy->id);
>
> data = pout->cmn_ldo_cntrl;
> dsi_phy_write(cmn_base + REG_DSI_14nm_PHY_CMN_LDO_CNTRL, data);
> @@ -565,7 +562,7 @@ static int dsi_pll_14nm_vco_set_rate(struct clk_hw
> *hw, unsigned long rate,
> struct dsi_pll_input *pin = &pll_14nm->in;
> struct dsi_pll_output *pout = &pll_14nm->out;
>
> - DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_14nm->id, rate,
> + DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_14nm->phy->id, rate,
> parent_rate);
>
> pll_14nm->vco_current_rate = rate;
> @@ -666,7 +663,7 @@ static int dsi_pll_14nm_vco_prepare(struct clk_hw
> *hw)
> POLL_TIMEOUT_US);
>
> if (unlikely(!locked)) {
> - DRM_DEV_ERROR(&pll_14nm->pdev->dev, "DSI PLL lock failed\n");
> + DRM_DEV_ERROR(&pll_14nm->phy->pdev->dev, "DSI PLL lock failed\n");
> return -EINVAL;
> }
>
> @@ -726,7 +723,7 @@ static unsigned long
> dsi_pll_14nm_postdiv_recalc_rate(struct clk_hw *hw,
> u8 width = postdiv->width;
> u32 val;
>
> - DBG("DSI%d PLL parent rate=%lu", pll_14nm->id, parent_rate);
> + DBG("DSI%d PLL parent rate=%lu", pll_14nm->phy->id, parent_rate);
>
> val = dsi_phy_read(base + REG_DSI_14nm_PHY_CMN_CLK_CFG0) >> shift;
> val &= div_mask(width);
> @@ -742,7 +739,7 @@ static long dsi_pll_14nm_postdiv_round_rate(struct
> clk_hw *hw,
> struct dsi_pll_14nm_postdiv *postdiv = to_pll_14nm_postdiv(hw);
> struct dsi_pll_14nm *pll_14nm = postdiv->pll;
>
> - DBG("DSI%d PLL parent rate=%lu", pll_14nm->id, rate);
> + DBG("DSI%d PLL parent rate=%lu", pll_14nm->phy->id, rate);
>
> return divider_round_rate(hw, rate, prate, NULL,
> postdiv->width,
> @@ -762,7 +759,7 @@ static int dsi_pll_14nm_postdiv_set_rate(struct
> clk_hw *hw, unsigned long rate,
> unsigned long flags = 0;
> u32 val;
>
> - DBG("DSI%d PLL parent rate=%lu parent rate %lu", pll_14nm->id, rate,
> + DBG("DSI%d PLL parent rate=%lu parent rate %lu", pll_14nm->phy->id,
> rate,
> parent_rate);
>
> value = divider_get_val(rate, parent_rate, NULL, postdiv->width,
> @@ -813,7 +810,7 @@ static void dsi_14nm_save_state(struct msm_dsi_phy
> *phy)
> cached_state->n1postdiv = data & 0xf;
> cached_state->n2postdiv = (data >> 4) & 0xf;
>
> - DBG("DSI%d PLL save state %x %x", pll_14nm->id,
> + DBG("DSI%d PLL save state %x %x", pll_14nm->phy->id,
> cached_state->n1postdiv, cached_state->n2postdiv);
>
> cached_state->vco_rate = clk_hw_get_rate(phy->vco_hw);
> @@ -830,14 +827,14 @@ static int dsi_14nm_restore_state(struct
> msm_dsi_phy *phy)
> ret = dsi_pll_14nm_vco_set_rate(phy->vco_hw,
> cached_state->vco_rate, 0);
> if (ret) {
> - DRM_DEV_ERROR(&pll_14nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_14nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
>
> data = cached_state->n1postdiv | (cached_state->n2postdiv << 4);
>
> - DBG("DSI%d PLL restore state %x %x", pll_14nm->id,
> + DBG("DSI%d PLL restore state %x %x", pll_14nm->phy->id,
> cached_state->n1postdiv, cached_state->n2postdiv);
>
> dsi_phy_write(cmn_base + REG_DSI_14nm_PHY_CMN_CLK_CFG0, data);
> @@ -865,7 +862,7 @@ static int dsi_14nm_set_usecase(struct msm_dsi_phy
> *phy)
> break;
> case MSM_DSI_PHY_MASTER:
> clkbuflr_en = 0x3;
> - pll_14nm->slave = pll_14nm_list[(pll_14nm->id + 1) % DSI_MAX];
> + pll_14nm->slave = pll_14nm_list[(pll_14nm->phy->id + 1) % DSI_MAX];
> break;
> case MSM_DSI_PHY_SLAVE:
> clkbuflr_en = 0x0;
> @@ -889,7 +886,7 @@ static struct clk_hw
> *pll_14nm_postdiv_register(struct dsi_pll_14nm *pll_14nm,
> u8 shift)
> {
> struct dsi_pll_14nm_postdiv *pll_postdiv;
> - struct device *dev = &pll_14nm->pdev->dev;
> + struct device *dev = &pll_14nm->phy->pdev->dev;
> struct clk_init_data postdiv_init = {
> .parent_names = (const char *[]) { parent_name },
> .num_parents = 1,
> @@ -928,21 +925,21 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
> .flags = CLK_IGNORE_UNUSED,
> .ops = &clk_ops_dsi_pll_14nm_vco,
> };
> - struct device *dev = &pll_14nm->pdev->dev;
> + struct device *dev = &pll_14nm->phy->pdev->dev;
> struct clk_hw *hw;
> int ret;
>
> - DBG("DSI%d", pll_14nm->id);
> + DBG("DSI%d", pll_14nm->phy->id);
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_14nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_14nm->phy->id);
> pll_14nm->clk_hw.init = &vco_init;
>
> ret = devm_clk_hw_register(dev, &pll_14nm->clk_hw);
> if (ret)
> return ret;
>
> - snprintf(clk_name, 32, "dsi%dn1_postdiv_clk", pll_14nm->id);
> - snprintf(parent, 32, "dsi%dvco_clk", pll_14nm->id);
> + snprintf(clk_name, 32, "dsi%dn1_postdiv_clk", pll_14nm->phy->id);
> + snprintf(parent, 32, "dsi%dvco_clk", pll_14nm->phy->id);
>
> /* N1 postdiv, bits 0-3 in REG_DSI_14nm_PHY_CMN_CLK_CFG0 */
> hw = pll_14nm_postdiv_register(pll_14nm, clk_name, parent,
> @@ -950,8 +947,8 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dpllbyte", pll_14nm->id);
> - snprintf(parent, 32, "dsi%dn1_postdiv_clk", pll_14nm->id);
> + snprintf(clk_name, 32, "dsi%dpllbyte", pll_14nm->phy->id);
> + snprintf(parent, 32, "dsi%dn1_postdiv_clk", pll_14nm->phy->id);
>
> /* DSI Byte clock = VCO_CLK / N1 / 8 */
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> @@ -961,8 +958,8 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
>
> provided_clocks[DSI_BYTE_PLL_CLK] = hw;
>
> - snprintf(clk_name, 32, "dsi%dn1_postdivby2_clk", pll_14nm->id);
> - snprintf(parent, 32, "dsi%dn1_postdiv_clk", pll_14nm->id);
> + snprintf(clk_name, 32, "dsi%dn1_postdivby2_clk", pll_14nm->phy->id);
> + snprintf(parent, 32, "dsi%dn1_postdiv_clk", pll_14nm->phy->id);
>
> /*
> * Skip the mux for now, force DSICLK_SEL to 1, Add a /2 divider
> @@ -972,8 +969,8 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dpll", pll_14nm->id);
> - snprintf(parent, 32, "dsi%dn1_postdivby2_clk", pll_14nm->id);
> + snprintf(clk_name, 32, "dsi%dpll", pll_14nm->phy->id);
> + snprintf(parent, 32, "dsi%dn1_postdivby2_clk", pll_14nm->phy->id);
>
> /* DSI pixel clock = VCO_CLK / N1 / 2 / N2
> * This is the output of N2 post-divider, bits 4-7 in
> @@ -991,7 +988,6 @@ static int pll_14nm_register(struct dsi_pll_14nm
> *pll_14nm, struct clk_hw **prov
> static int dsi_pll_14nm_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_14nm *pll_14nm;
> int ret;
>
> @@ -1002,11 +998,9 @@ static int dsi_pll_14nm_init(struct msm_dsi_phy
> *phy)
> if (!pll_14nm)
> return -ENOMEM;
>
> - DBG("PLL%d", id);
> + DBG("PLL%d", phy->id);
>
> - pll_14nm->pdev = pdev;
> - pll_14nm->id = id;
> - pll_14nm_list[id] = pll_14nm;
> + pll_14nm_list[phy->id] = pll_14nm;
>
> spin_lock_init(&pll_14nm->postdiv_lock);
>
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
> index bdb117938bcc..0bcea3f3eca3 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
> @@ -67,9 +67,6 @@ struct pll_28nm_cached_state {
> struct dsi_pll_28nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> struct pll_28nm_cached_state cached_state;
> @@ -117,7 +114,7 @@ static int dsi_pll_28nm_clk_set_rate(struct clk_hw
> *hw, unsigned long rate,
> unsigned long parent_rate)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> void __iomem *base = pll_28nm->phy->pll_base;
> unsigned long div_fbx1000, gen_vco_clk;
> u32 refclk_cfg, frac_n_mode, frac_n_value;
> @@ -288,14 +285,14 @@ static unsigned long
> dsi_pll_28nm_clk_recalc_rate(struct clk_hw *hw,
>
> static int _dsi_pll_28nm_vco_prepare_hpm(struct dsi_pll_28nm
> *pll_28nm)
> {
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> void __iomem *base = pll_28nm->phy->pll_base;
> u32 max_reads = 5, timeout_us = 100;
> bool locked;
> u32 val;
> int i;
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> pll_28nm_software_reset(pll_28nm);
>
> @@ -382,13 +379,13 @@ static int dsi_pll_28nm_vco_prepare_hpm(struct
> clk_hw *hw)
> static int dsi_pll_28nm_vco_prepare_lp(struct clk_hw *hw)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> void __iomem *base = pll_28nm->phy->pll_base;
> bool locked;
> u32 max_reads = 10, timeout_us = 50;
> u32 val;
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> if (unlikely(pll_28nm->phy->pll_on))
> return 0;
> @@ -432,7 +429,7 @@ static void dsi_pll_28nm_vco_unprepare(struct
> clk_hw *hw)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> if (unlikely(!pll_28nm->phy->pll_on))
> return;
> @@ -504,7 +501,7 @@ static int dsi_28nm_restore_state(struct
> msm_dsi_phy *phy)
> ret = dsi_pll_28nm_clk_set_rate(phy->vco_hw,
> cached_state->vco_rate, 0);
> if (ret) {
> - DRM_DEV_ERROR(&pll_28nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_28nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
> @@ -528,25 +525,25 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> .name = vco_name,
> .flags = CLK_IGNORE_UNUSED,
> };
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> struct clk_hw *hw;
> int ret;
>
> - DBG("%d", pll_28nm->id);
> + DBG("%d", pll_28nm->phy->id);
>
> if (pll_28nm->phy->cfg->quirks & DSI_PHY_28NM_QUIRK_PHY_LP)
> vco_init.ops = &clk_ops_dsi_pll_28nm_vco_lp;
> else
> vco_init.ops = &clk_ops_dsi_pll_28nm_vco_hpm;
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_28nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> pll_28nm->clk_hw.init = &vco_init;
> ret = devm_clk_hw_register(dev, &pll_28nm->clk_hw);
> if (ret)
> return ret;
>
> - snprintf(clk_name, 32, "dsi%danalog_postdiv_clk", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%danalog_postdiv_clk", pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent1, CLK_SET_RATE_PARENT,
> pll_28nm->phy->pll_base +
> @@ -555,16 +552,16 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dindirect_path_div2_clk", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%danalog_postdiv_clk", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dindirect_path_div2_clk",
> pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%danalog_postdiv_clk", pll_28nm->phy->id);
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name,
> parent1, CLK_SET_RATE_PARENT,
> 1, 2);
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dpll", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dpll", pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent1, 0, pll_28nm->phy->pll_base +
> REG_DSI_28nm_PHY_PLL_POSTDIV3_CFG,
> @@ -573,9 +570,9 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> return PTR_ERR(hw);
> provided_clocks[DSI_PIXEL_PLL_CLK] = hw;
>
> - snprintf(clk_name, 32, "dsi%dbyte_mux", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->id);
> - snprintf(parent2, 32, "dsi%dindirect_path_div2_clk", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dbyte_mux", pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> + snprintf(parent2, 32, "dsi%dindirect_path_div2_clk",
> pll_28nm->phy->id);
> hw = devm_clk_hw_register_mux(dev, clk_name,
> ((const char *[]){
> parent1, parent2
> @@ -584,8 +581,8 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> if (IS_ERR(hw))
> return PTR_ERR(hw);
>
> - snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->id);
> - snprintf(parent1, 32, "dsi%dbyte_mux", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->phy->id);
> + snprintf(parent1, 32, "dsi%dbyte_mux", pll_28nm->phy->id);
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name,
> parent1, CLK_SET_RATE_PARENT, 1, 4);
> if (IS_ERR(hw))
> @@ -598,7 +595,6 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> static int dsi_pll_28nm_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_28nm *pll_28nm;
> int ret;
>
> @@ -609,8 +605,6 @@ static int dsi_pll_28nm_init(struct msm_dsi_phy
> *phy)
> if (!pll_28nm)
> return -ENOMEM;
>
> - pll_28nm->pdev = pdev;
> - pll_28nm->id = id;
> pll_28nm->phy = phy;
>
> ret = pll_28nm_register(pll_28nm, phy->provided_clocks->hws);
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c
> index 36ee3f15d1e0..9ddd0adccce3 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c
> @@ -59,9 +59,6 @@ struct clk_bytediv {
> struct dsi_pll_28nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> struct pll_28nm_cached_state cached_state;
> @@ -178,14 +175,14 @@ static unsigned long
> dsi_pll_28nm_clk_recalc_rate(struct clk_hw *hw,
> static int dsi_pll_28nm_vco_prepare(struct clk_hw *hw)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> void __iomem *base = pll_28nm->phy->pll_base;
> bool locked;
> unsigned int bit_div, byte_div;
> int max_reads = 1000, timeout_us = 100;
> u32 val;
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> if (unlikely(pll_28nm->phy->pll_on))
> return 0;
> @@ -227,7 +224,7 @@ static void dsi_pll_28nm_vco_unprepare(struct
> clk_hw *hw)
> {
> struct dsi_pll_28nm *pll_28nm = to_pll_28nm(hw);
>
> - DBG("id=%d", pll_28nm->id);
> + DBG("id=%d", pll_28nm->phy->id);
>
> if (unlikely(!pll_28nm->phy->pll_on))
> return;
> @@ -368,7 +365,7 @@ static int dsi_28nm_restore_state(struct
> msm_dsi_phy *phy)
> ret = dsi_pll_28nm_clk_set_rate(phy->vco_hw,
> cached_state->vco_rate, 0);
> if (ret) {
> - DRM_DEV_ERROR(&pll_28nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_28nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
> @@ -392,13 +389,13 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> .flags = CLK_IGNORE_UNUSED,
> .ops = &clk_ops_dsi_pll_28nm_vco,
> };
> - struct device *dev = &pll_28nm->pdev->dev;
> + struct device *dev = &pll_28nm->phy->pdev->dev;
> struct clk_hw *hw;
> struct clk_bytediv *bytediv;
> struct clk_init_data bytediv_init = { };
> int ret;
>
> - DBG("%d", pll_28nm->id);
> + DBG("%d", pll_28nm->phy->id);
>
> bytediv = devm_kzalloc(dev, sizeof(*bytediv), GFP_KERNEL);
> if (!bytediv)
> @@ -412,7 +409,7 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> if (!clk_name)
> return -ENOMEM;
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_28nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> vco_init.name = vco_name;
>
> pll_28nm->clk_hw.init = &vco_init;
> @@ -425,8 +422,8 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> bytediv->hw.init = &bytediv_init;
> bytediv->reg = pll_28nm->phy->pll_base +
> REG_DSI_28nm_8960_PHY_PLL_CTRL_9;
>
> - snprintf(parent_name, 32, "dsi%dvco_clk", pll_28nm->id);
> - snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->id);
> + snprintf(parent_name, 32, "dsi%dvco_clk", pll_28nm->phy->id);
> + snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->phy->id);
>
> bytediv_init.name = clk_name;
> bytediv_init.ops = &clk_bytediv_ops;
> @@ -440,7 +437,7 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> return ret;
> provided_clocks[DSI_BYTE_PLL_CLK] = &bytediv->hw;
>
> - snprintf(clk_name, 32, "dsi%dpll", pll_28nm->id);
> + snprintf(clk_name, 32, "dsi%dpll", pll_28nm->phy->id);
> /* DIV3 */
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent_name, 0, pll_28nm->phy->pll_base +
> @@ -456,7 +453,6 @@ static int pll_28nm_register(struct dsi_pll_28nm
> *pll_28nm, struct clk_hw **prov
> static int dsi_pll_28nm_8960_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_28nm *pll_28nm;
> int ret;
>
> @@ -467,8 +463,6 @@ static int dsi_pll_28nm_8960_init(struct
> msm_dsi_phy *phy)
> if (!pll_28nm)
> return -ENOMEM;
>
> - pll_28nm->pdev = pdev;
> - pll_28nm->id = id + 1;
> pll_28nm->phy = phy;
>
> ret = pll_28nm_register(pll_28nm, phy->provided_clocks->hws);
> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
> index 8e8cf9e63e8f..4df237ad0eaf 100644
> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
> @@ -86,9 +86,6 @@ struct pll_7nm_cached_state {
> struct dsi_pll_7nm {
> struct clk_hw clk_hw;
>
> - int id;
> - struct platform_device *pdev;
> -
> struct msm_dsi_phy *phy;
>
> u64 vco_ref_clk_rate;
> @@ -320,7 +317,7 @@ static int dsi_pll_7nm_vco_set_rate(struct clk_hw
> *hw, unsigned long rate,
> {
> struct dsi_pll_7nm *pll_7nm = to_pll_7nm(hw);
>
> - DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_7nm->id, rate,
> + DBG("DSI PLL%d rate=%lu, parent's=%lu", pll_7nm->phy->id, rate,
> parent_rate);
>
> pll_7nm->vco_current_rate = rate;
> @@ -359,7 +356,7 @@ static int dsi_pll_7nm_lock_status(struct
> dsi_pll_7nm *pll)
> timeout_us);
> if (rc)
> pr_err("DSI PLL(%d) lock failed, status=0x%08x\n",
> - pll->id, status);
> + pll->phy->id, status);
>
> return rc;
> }
> @@ -435,7 +432,7 @@ static int dsi_pll_7nm_vco_prepare(struct clk_hw
> *hw)
> /* Check for PLL lock */
> rc = dsi_pll_7nm_lock_status(pll_7nm);
> if (rc) {
> - pr_err("PLL(%d) lock failed\n", pll_7nm->id);
> + pr_err("PLL(%d) lock failed\n", pll_7nm->phy->id);
> goto error;
> }
>
> @@ -519,7 +516,7 @@ static unsigned long
> dsi_pll_7nm_vco_recalc_rate(struct clk_hw *hw,
> vco_rate = pll_freq;
>
> DBG("DSI PLL%d returning vco rate = %lu, dec = %x, frac = %x",
> - pll_7nm->id, (unsigned long)vco_rate, dec, frac);
> + pll_7nm->phy->id, (unsigned long)vco_rate, dec, frac);
>
> return (unsigned long)vco_rate;
> }
> @@ -568,7 +565,7 @@ static void dsi_7nm_save_state(struct msm_dsi_phy
> *phy)
> cached->pll_mux = cmn_clk_cfg1 & 0x3;
>
> DBG("DSI PLL%d outdiv %x bit_clk_div %x pix_clk_div %x pll_mux %x",
> - pll_7nm->id, cached->pll_out_div, cached->bit_clk_div,
> + pll_7nm->phy->id, cached->pll_out_div, cached->bit_clk_div,
> cached->pix_clk_div, cached->pll_mux);
> }
>
> @@ -595,12 +592,12 @@ static int dsi_7nm_restore_state(struct
> msm_dsi_phy *phy)
>
> ret = dsi_pll_7nm_vco_set_rate(phy->vco_hw,
> pll_7nm->vco_current_rate, pll_7nm->vco_ref_clk_rate);
> if (ret) {
> - DRM_DEV_ERROR(&pll_7nm->pdev->dev,
> + DRM_DEV_ERROR(&pll_7nm->phy->pdev->dev,
> "restore vco rate failed. ret=%d\n", ret);
> return ret;
> }
>
> - DBG("DSI PLL%d", pll_7nm->id);
> + DBG("DSI PLL%d", pll_7nm->phy->id);
>
> return 0;
> }
> @@ -611,13 +608,13 @@ static int dsi_7nm_set_usecase(struct msm_dsi_phy
> *phy)
> void __iomem *base = phy->base;
> u32 data = 0x0; /* internal PLL */
>
> - DBG("DSI PLL%d", pll_7nm->id);
> + DBG("DSI PLL%d", pll_7nm->phy->id);
>
> switch (phy->usecase) {
> case MSM_DSI_PHY_STANDALONE:
> break;
> case MSM_DSI_PHY_MASTER:
> - pll_7nm->slave = pll_7nm_list[(pll_7nm->id + 1) % DSI_MAX];
> + pll_7nm->slave = pll_7nm_list[(pll_7nm->phy->id + 1) % DSI_MAX];
> break;
> case MSM_DSI_PHY_SLAVE:
> data = 0x1; /* external PLL */
> @@ -649,21 +646,21 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> .flags = CLK_IGNORE_UNUSED,
> .ops = &clk_ops_dsi_pll_7nm_vco,
> };
> - struct device *dev = &pll_7nm->pdev->dev;
> + struct device *dev = &pll_7nm->phy->pdev->dev;
> struct clk_hw *hw;
> int ret;
>
> - DBG("DSI%d", pll_7nm->id);
> + DBG("DSI%d", pll_7nm->phy->id);
>
> - snprintf(vco_name, 32, "dsi%dvco_clk", pll_7nm->id);
> + snprintf(vco_name, 32, "dsi%dvco_clk", pll_7nm->phy->id);
> pll_7nm->clk_hw.init = &vco_init;
>
> ret = devm_clk_hw_register(dev, &pll_7nm->clk_hw);
> if (ret)
> return ret;
>
> - snprintf(clk_name, 32, "dsi%d_pll_out_div_clk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%dvco_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_out_div_clk", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%dvco_clk", pll_7nm->phy->id);
>
> hw = devm_clk_hw_register_divider(dev, clk_name,
> parent, CLK_SET_RATE_PARENT,
> @@ -675,8 +672,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pll_bit_clk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_bit_clk", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_7nm->phy->id);
>
> /* BIT CLK: DIV_CTRL_3_0 */
> hw = devm_clk_hw_register_divider(dev, clk_name, parent,
> @@ -690,8 +687,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk",
> pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->phy->id);
>
> /* DSI Byte clock = VCO_CLK / OUT_DIV / BIT_DIV / 8 */
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> @@ -703,8 +700,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
>
> provided_clocks[DSI_BYTE_PLL_CLK] = hw;
>
> - snprintf(clk_name, 32, "dsi%d_pll_by_2_bit_clk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_by_2_bit_clk", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->phy->id);
>
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> 0, 1, 2);
> @@ -713,8 +710,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pll_post_out_div_clk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pll_post_out_div_clk",
> pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_out_div_clk", pll_7nm->phy->id);
>
> hw = devm_clk_hw_register_fixed_factor(dev, clk_name, parent,
> 0, 1, 4);
> @@ -723,11 +720,11 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_pclk_mux", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->id);
> - snprintf(parent2, 32, "dsi%d_pll_by_2_bit_clk", pll_7nm->id);
> - snprintf(parent3, 32, "dsi%d_pll_out_div_clk", pll_7nm->id);
> - snprintf(parent4, 32, "dsi%d_pll_post_out_div_clk", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_pclk_mux", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_7nm->phy->id);
> + snprintf(parent2, 32, "dsi%d_pll_by_2_bit_clk", pll_7nm->phy->id);
> + snprintf(parent3, 32, "dsi%d_pll_out_div_clk", pll_7nm->phy->id);
> + snprintf(parent4, 32, "dsi%d_pll_post_out_div_clk",
> pll_7nm->phy->id);
>
> hw = devm_clk_hw_register_mux(dev, clk_name,
> ((const char *[]){
> @@ -740,8 +737,8 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> goto fail;
> }
>
> - snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk", pll_7nm->id);
> - snprintf(parent, 32, "dsi%d_pclk_mux", pll_7nm->id);
> + snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk", pll_7nm->phy->id);
> + snprintf(parent, 32, "dsi%d_pclk_mux", pll_7nm->phy->id);
>
> /* PIX CLK DIV : DIV_CTRL_7_4*/
> hw = devm_clk_hw_register_divider(dev, clk_name, parent,
> @@ -766,7 +763,6 @@ static int pll_7nm_register(struct dsi_pll_7nm
> *pll_7nm, struct clk_hw **provide
> static int dsi_pll_7nm_init(struct msm_dsi_phy *phy)
> {
> struct platform_device *pdev = phy->pdev;
> - int id = phy->id;
> struct dsi_pll_7nm *pll_7nm;
> int ret;
>
> @@ -774,11 +770,9 @@ static int dsi_pll_7nm_init(struct msm_dsi_phy
> *phy)
> if (!pll_7nm)
> return -ENOMEM;
>
> - DBG("DSI PLL%d", id);
> + DBG("DSI PLL%d", phy->id);
>
> - pll_7nm->pdev = pdev;
> - pll_7nm->id = id;
> - pll_7nm_list[id] = pll_7nm;
> + pll_7nm_list[phy->id] = pll_7nm;
>
> spin_lock_init(&pll_7nm->postdiv_lock);
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-03-30 3:24 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-27 11:02 [PATCH v3 00/25] drm/msm/dsi: refactor MSM DSI PHY/PLL drivers Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-27 11:02 ` [PATCH v3 01/25] clk: fixed: add devm helper for clk_hw_register_fixed_factor() Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-29 21:55 ` abhinavk
2021-03-29 21:55 ` abhinavk
2021-03-27 11:02 ` [PATCH v3 02/25] clk: mux: provide devm_clk_hw_register_mux() Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-30 0:46 ` Stephen Boyd
2021-03-30 0:46 ` Stephen Boyd
2021-03-27 11:02 ` [PATCH v3 03/25] clk: divider: add devm_clk_hw_register_divider Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-30 0:46 ` Stephen Boyd
2021-03-30 0:46 ` Stephen Boyd
2021-03-27 11:02 ` [PATCH v3 04/25] drm/msm/dsi: replace PHY's init callback with configurable data Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-27 11:02 ` [PATCH v3 05/25] drm/msm/dsi: fuse dsi_pll_* code into dsi_phy_* code Dmitry Baryshkov
2021-03-27 11:02 ` [PATCH v3 06/25] drm/msm/dsi: drop multiple pll enable_seq support Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-27 11:02 ` [PATCH v3 07/25] drm/msm/dsi: move all PLL callbacks into PHY config struct Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-27 11:02 ` [PATCH v3 08/25] drm/msm/dsi: drop global msm_dsi_phy_type enumaration Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-27 11:02 ` [PATCH v3 09/25] drm/msm/dsi: move min/max PLL rate to phy config Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-27 11:02 ` [PATCH v3 10/25] drm/msm/dsi: remove msm_dsi_pll_set_usecase Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-27 11:02 ` [PATCH v3 11/25] drm/msm/dsi: push provided clocks handling into a generic code Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-29 22:12 ` [Freedreno] " abhinavk
2021-03-29 22:12 ` abhinavk
2021-03-27 11:02 ` [PATCH v3 12/25] drm/msm/dsi: use devm_clk_*register to registe DSI PHY clocks Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-29 23:33 ` [Freedreno] " abhinavk
2021-03-29 23:33 ` abhinavk
2021-03-30 0:49 ` Stephen Boyd
2021-03-30 0:49 ` Stephen Boyd
2021-03-27 11:02 ` [PATCH v3 13/25] drm/msm/dsi: use devm_of_clk_add_hw_provider Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-29 23:43 ` [Freedreno] " abhinavk
2021-03-29 23:43 ` abhinavk
2021-03-30 0:50 ` Stephen Boyd
2021-03-30 0:50 ` Stephen Boyd
2021-03-27 11:02 ` [PATCH v3 14/25] drm/msm/dsi: make save/restore_state phy-level functions Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-29 23:51 ` [Freedreno] " abhinavk
2021-03-29 23:51 ` abhinavk
2021-03-27 11:02 ` [PATCH v3 15/25] drm/msm/dsi: drop vco_delay setting from 7nm, 10nm, 14nm drivers Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-30 0:01 ` [Freedreno] " abhinavk
2021-03-30 0:01 ` abhinavk
2021-03-27 11:02 ` [PATCH v3 16/25] drm/msm/dpu: simplify vco_delay handling in dsi_phy_28nm driver Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-30 0:03 ` [Freedreno] " abhinavk
2021-03-30 0:03 ` abhinavk
2021-03-27 11:02 ` [PATCH v3 17/25] drm/msi/dsi: inline msm_dsi_pll_helper_clk_prepare/unprepare Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-30 0:50 ` [Freedreno] " abhinavk
2021-03-30 0:50 ` abhinavk
2021-03-27 11:02 ` [PATCH v3 18/25] drm/msm/dsi: make save_state/restore_state callbacks accept msm_dsi_phy Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-30 3:09 ` abhinavk
2021-03-30 3:09 ` abhinavk
2021-03-27 11:02 ` [PATCH v3 19/25] drm/msm/dsi: drop msm_dsi_pll abstracton Dmitry Baryshkov
2021-03-27 11:02 ` Dmitry Baryshkov
2021-03-30 3:13 ` [Freedreno] " abhinavk
2021-03-30 3:13 ` abhinavk
2021-03-30 3:35 ` abhinavk
2021-03-30 3:35 ` abhinavk
2021-03-27 11:03 ` [PATCH v3 20/25] drm/msm/dsi: drop PLL accessor functions Dmitry Baryshkov
2021-03-27 11:03 ` Dmitry Baryshkov
2021-03-30 3:16 ` [Freedreno] " abhinavk
2021-03-30 3:16 ` abhinavk
2021-03-27 11:03 ` [PATCH v3 21/25] drm/msm/dsi: move ioremaps to dsi_phy_driver_probe Dmitry Baryshkov
2021-03-27 11:03 ` Dmitry Baryshkov
2021-03-30 3:18 ` [Freedreno] " abhinavk
2021-03-30 3:18 ` abhinavk
2021-03-27 11:03 ` [PATCH v3 22/25] drm/msm/dsi: remove duplicate fields from dsi_pll_Nnm instances Dmitry Baryshkov
2021-03-27 11:03 ` Dmitry Baryshkov
2021-03-30 3:23 ` abhinavk [this message]
2021-03-30 3:23 ` abhinavk
2021-03-27 11:03 ` [PATCH v3 23/25] drm/msm/dsi: remove temp data from global pll structure Dmitry Baryshkov
2021-03-27 11:03 ` Dmitry Baryshkov
2021-03-30 3:26 ` [Freedreno] " abhinavk
2021-03-30 3:26 ` abhinavk
2021-03-30 15:23 ` Dmitry Baryshkov
2021-03-30 15:23 ` Dmitry Baryshkov
2021-03-27 11:03 ` [PATCH v3 24/25] drm/msm/dsi: inline msm_dsi_phy_set_src_pll Dmitry Baryshkov
2021-03-27 11:03 ` Dmitry Baryshkov
2021-03-30 3:34 ` [Freedreno] " abhinavk
2021-03-30 3:34 ` abhinavk
2021-03-30 13:42 ` Dmitry Baryshkov
2021-03-30 13:42 ` Dmitry Baryshkov
2021-03-30 17:44 ` abhinavk
2021-03-30 17:44 ` abhinavk
2021-03-27 11:03 ` [PATCH v3 25/25] drm/msm/dsi: stop passing src_pll_id to the phy_enable call Dmitry Baryshkov
2021-03-27 11:03 ` Dmitry Baryshkov
2021-03-30 19:29 ` [Freedreno] " abhinavk
2021-03-30 19:29 ` abhinavk
2021-03-30 1:31 ` [PATCH v3 00/25] drm/msm/dsi: refactor MSM DSI PHY/PLL drivers Stephen Boyd
2021-03-30 1:31 ` Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9b6df6e547d3a5f69342027e2b66d4db@codeaurora.org \
--to=abhinavk@codeaurora.org \
--cc=airlied@linux.ie \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=jonathan@marek.ca \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=robdclark@gmail.com \
--cc=sboyd@kernel.org \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.