phy: rockchip: samsung-hdptx: Switch to driver specific HDMI config

In preparation to support the FRL operation mode which gets configured
via the lanes and rate per lane tuple, switch to a driver specific
struct for configuring the link rate and bpc.

This simplifies and optimizes the implementation by allowing implicit
switches between TMDS and FRL rates, without requiring additional checks
of the active PHY mode followed by recalculations of the link rate when
operating in FRL mode.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://patch.msgid.link/20260113-phy-hdptx-frl-v6-9-8d5f97419c0b@collabora.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
index 6297a5171e78a429b51f721714f061b26edcd35a..f1cad026495221f497fc1951c7729bae23ec34b1 100644 (file)
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
@@ -373,6 +373,11 @@ struct rk_hdptx_phy_cfg {
        unsigned int phy_ids[MAX_HDPTX_PHY_NUM];
 };
 
+struct rk_hdptx_hdmi_cfg {
+       unsigned long long rate;
+       unsigned int bpc;
+};
+
 struct rk_hdptx_phy {
        struct device *dev;
        struct regmap *regmap;
@@ -380,7 +385,7 @@ struct rk_hdptx_phy {
 
        int phy_id;
        struct phy *phy;
-       struct phy_configure_opts_hdmi hdmi_cfg;
+       struct rk_hdptx_hdmi_cfg hdmi_cfg;
        struct clk_bulk_data *clks;
        int nr_clks;
        struct reset_control_bulk_data rsts[RST_MAX];
@@ -932,19 +937,19 @@ static int rk_hdptx_tmds_ropll_cmn_config(struct rk_hdptx_phy *hdptx)
        struct ropll_config rc = {0};
        int i;
 
-       if (!hdptx->hdmi_cfg.tmds_char_rate)
+       if (!hdptx->hdmi_cfg.rate)
                return 0;
 
        for (i = 0; i < ARRAY_SIZE(rk_hdptx_tmds_ropll_cfg); i++)
-               if (hdptx->hdmi_cfg.tmds_char_rate == rk_hdptx_tmds_ropll_cfg[i].rate) {
+               if (hdptx->hdmi_cfg.rate == rk_hdptx_tmds_ropll_cfg[i].rate) {
                        cfg = &rk_hdptx_tmds_ropll_cfg[i];
                        break;
                }
 
        if (!cfg) {
-               if (!rk_hdptx_phy_clk_pll_calc(hdptx->hdmi_cfg.tmds_char_rate, &rc)) {
+               if (!rk_hdptx_phy_clk_pll_calc(hdptx->hdmi_cfg.rate, &rc)) {
                        dev_err(hdptx->dev, "%s cannot find pll cfg for rate=%llu\n",
-                               __func__, hdptx->hdmi_cfg.tmds_char_rate);
+                               __func__, hdptx->hdmi_cfg.rate);
                        return -EINVAL;
                }
 
@@ -952,7 +957,7 @@ static int rk_hdptx_tmds_ropll_cmn_config(struct rk_hdptx_phy *hdptx)
        }
 
        dev_dbg(hdptx->dev, "%s rate=%llu mdiv=%u sdiv=%u sdm_en=%u k_sign=%u k=%u lc=%u\n",
-               __func__, hdptx->hdmi_cfg.tmds_char_rate, cfg->pms_mdiv, cfg->pms_sdiv + 1,
+               __func__, hdptx->hdmi_cfg.rate, cfg->pms_mdiv, cfg->pms_sdiv + 1,
                cfg->sdm_en, cfg->sdm_num_sign, cfg->sdm_num, cfg->sdm_deno);
 
        rk_hdptx_pre_power_up(hdptx);
@@ -1001,7 +1006,7 @@ static int rk_hdptx_tmds_ropll_mode_config(struct rk_hdptx_phy *hdptx)
 
        regmap_write(hdptx->regmap, LNTOP_REG(0200), 0x06);
 
-       if (hdptx->hdmi_cfg.tmds_char_rate > HDMI14_MAX_RATE) {
+       if (hdptx->hdmi_cfg.rate > HDMI14_MAX_RATE) {
                /* For 1/40 bitrate clk */
                rk_hdptx_multi_reg_write(hdptx, rk_hdptx_tmds_lntop_highbr_seq);
        } else {
@@ -1372,19 +1377,19 @@ static int rk_hdptx_phy_power_on(struct phy *phy)
        int ret, lane;
 
        if (mode != PHY_MODE_DP) {
-               if (!hdptx->hdmi_cfg.tmds_char_rate) {
+               if (!hdptx->hdmi_cfg.rate) {
                        /*
                         * FIXME: Temporary workaround to setup TMDS char rate
                         * from the RK DW HDMI QP bridge driver.
                         * Will be removed as soon the switch to the HDMI PHY
                         * configuration API has been completed on both ends.
                         */
-                       hdptx->hdmi_cfg.tmds_char_rate = phy_get_bus_width(hdptx->phy) & 0xfffffff;
-                       hdptx->hdmi_cfg.tmds_char_rate *= 100;
+                       hdptx->hdmi_cfg.rate = phy_get_bus_width(hdptx->phy) & 0xfffffff;
+                       hdptx->hdmi_cfg.rate *= 100;
                }
 
                dev_dbg(hdptx->dev, "%s rate=%llu bpc=%u\n", __func__,
-                       hdptx->hdmi_cfg.tmds_char_rate, hdptx->hdmi_cfg.bpc);
+                       hdptx->hdmi_cfg.rate, hdptx->hdmi_cfg.bpc);
        }
 
        ret = rk_hdptx_phy_consumer_get(hdptx);
@@ -1731,12 +1736,13 @@ static int rk_hdptx_phy_configure(struct phy *phy, union phy_configure_opts *opt
                if (ret) {
                        dev_err(hdptx->dev, "invalid hdmi params for phy configure\n");
                } else {
-                       hdptx->hdmi_cfg = opts->hdmi;
+                       hdptx->hdmi_cfg.rate = opts->hdmi.tmds_char_rate;
+                       hdptx->hdmi_cfg.bpc = opts->hdmi.bpc;
                        hdptx->restrict_rate_change = true;
                }
 
                dev_dbg(hdptx->dev, "%s rate=%llu bpc=%u\n", __func__,
-                       hdptx->hdmi_cfg.tmds_char_rate, hdptx->hdmi_cfg.bpc);
+                       hdptx->hdmi_cfg.rate, hdptx->hdmi_cfg.bpc);
                return ret;
        }
 
@@ -1916,7 +1922,7 @@ static int rk_hdptx_phy_clk_determine_rate(struct clk_hw *hw,
         * To be dropped as soon as the RK DW HDMI QP bridge driver
         * switches to make use of phy_configure().
         */
-       if (!hdptx->restrict_rate_change && req->rate != hdptx->hdmi_cfg.tmds_char_rate) {
+       if (!hdptx->restrict_rate_change && req->rate != hdptx->hdmi_cfg.rate) {
                struct phy_configure_opts_hdmi hdmi = {
                        .tmds_char_rate = req->rate,
                };
@@ -1925,7 +1931,7 @@ static int rk_hdptx_phy_clk_determine_rate(struct clk_hw *hw,
                if (ret)
                        return ret;
 
-               hdptx->hdmi_cfg = hdmi;
+               hdptx->hdmi_cfg.rate = req->rate;
        }
 
        /*
@@ -1933,8 +1939,7 @@ static int rk_hdptx_phy_clk_determine_rate(struct clk_hw *hw,
         * hence ensure rk_hdptx_phy_clk_set_rate() won't be invoked with
         * a different rate argument.
         */
-       req->rate = DIV_ROUND_CLOSEST_ULL(hdptx->hdmi_cfg.tmds_char_rate * 8,
-                                         hdptx->hdmi_cfg.bpc);
+       req->rate = DIV_ROUND_CLOSEST_ULL(hdptx->hdmi_cfg.rate * 8, hdptx->hdmi_cfg.bpc);
 
        return 0;
 }
@@ -1945,11 +1950,11 @@ static int rk_hdptx_phy_clk_set_rate(struct clk_hw *hw, unsigned long rate,
        struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
        unsigned long long tmds_rate = DIV_ROUND_CLOSEST_ULL(rate * hdptx->hdmi_cfg.bpc, 8);
 
-       /* Revert any unlikely TMDS char rate change since round_rate() */
-       if (hdptx->hdmi_cfg.tmds_char_rate != tmds_rate) {
+       /* Revert any unlikely TMDS char rate change since determine_rate() */
+       if (hdptx->hdmi_cfg.rate != tmds_rate) {
                dev_warn(hdptx->dev, "Reverting unexpected rate change from %llu to %llu\n",
-                        tmds_rate, hdptx->hdmi_cfg.tmds_char_rate);
-               hdptx->hdmi_cfg.tmds_char_rate = tmds_rate;
+                        tmds_rate, hdptx->hdmi_cfg.rate);
+               hdptx->hdmi_cfg.rate = tmds_rate;
        }
 
        /*