[PATCH v1] Revert "phy: freescale: fsl-samsung-hdmi: initialize default rate"
From: Francesco Dolcini
Date: Mon Nov 16 2026 - 11:24:59 EST
From: Francesco Dolcini <francesco.dolcini@xxxxxxxxxxx>
This reverts commit c01ccf91b257741e9edc374a465126bae9ae4711.
Programming the 74.25 MHz configuration at probe fails on i.MX8MP boards,
the PHY probe aborts and HDMI is no longer available:
fsl-samsung-hdmi-phy 32fdff00.phy: PLL failed to lock
fsl-samsung-hdmi-phy 32fdff00.phy: error -ETIMEDOUT: failed to configure default rate
fsl-samsung-hdmi-phy 32fdff00.phy: probe with driver fsl-samsung-hdmi-phy failed with error -110
Reported-by: Alexander Stein <alexander.stein@xxxxxxxxxxxxxxx>
Closes: https://lore.kernel.org/all/13219248.O9o76ZdvQC@steina-w/
Fixes: c01ccf91b257 ("phy: freescale: fsl-samsung-hdmi: initialize default rate")
Signed-off-by: Francesco Dolcini <francesco.dolcini@xxxxxxxxxxx>
---
drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 59 +++++---------------
1 file changed, 15 insertions(+), 44 deletions(-)
diff --git a/drivers/phy/freescale/phy-fsl-samsung-hdmi.c b/drivers/phy/freescale/phy-fsl-samsung-hdmi.c
index aaa651abcbc6..d7418c2197c9 100644
--- a/drivers/phy/freescale/phy-fsl-samsung-hdmi.c
+++ b/drivers/phy/freescale/phy-fsl-samsung-hdmi.c
@@ -44,8 +44,6 @@
#define MHZ (1000UL * 1000UL)
#endif
-#define PHY_DEFAULT_RATE 74250000
-
#define PHY_PLL_DIV_REGS_NUM 7
struct phy_config {
@@ -491,6 +489,17 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,
return ret;
}
+static unsigned long phy_clk_recalc_rate(struct clk_hw *hw,
+ unsigned long parent_rate)
+{
+ struct fsl_samsung_hdmi_phy *phy = to_fsl_samsung_hdmi_phy(hw);
+
+ if (!phy->cur_cfg)
+ return 74250000;
+
+ return phy->cur_cfg->pixclk;
+}
+
/* Helper function to lookup the available fractional-divider rate */
static const struct phy_config *fsl_samsung_hdmi_phy_lookup_rate(unsigned long rate)
{
@@ -511,14 +520,6 @@ static const struct phy_config *fsl_samsung_hdmi_phy_lookup_rate(unsigned long r
&phy_pll_cfg[i] : &phy_pll_cfg[i+1]);
}
-static unsigned long phy_clk_recalc_rate(struct clk_hw *hw,
- unsigned long parent_rate)
-{
- struct fsl_samsung_hdmi_phy *phy = to_fsl_samsung_hdmi_phy(hw);
-
- return phy->cur_cfg->pixclk;
-}
-
static void fsl_samsung_hdmi_calculate_phy(struct phy_config *cal_phy, unsigned long rate,
u8 p, u16 m, u8 s)
{
@@ -639,7 +640,6 @@ static int phy_clk_register(struct fsl_samsung_hdmi_phy *phy)
static int fsl_samsung_hdmi_phy_probe(struct platform_device *pdev)
{
- const struct phy_config *default_cfg;
struct fsl_samsung_hdmi_phy *phy;
int ret;
@@ -664,23 +664,6 @@ static int fsl_samsung_hdmi_phy_probe(struct platform_device *pdev)
return dev_err_probe(phy->dev, PTR_ERR(phy->refclk),
"failed to get ref clk\n");
- /*
- * Establish the rate reported by recalc_rate() before registering the
- * clock. Otherwise CCF may skip the first set_rate() when it requests
- * the assumed default rate, leaving the PHY unconfigured.
- */
- ret = clk_prepare_enable(phy->refclk);
- if (ret)
- return dev_err_probe(phy->dev, ret,
- "failed to enable ref clk\n");
-
- default_cfg = fsl_samsung_hdmi_phy_lookup_rate(PHY_DEFAULT_RATE);
- ret = fsl_samsung_hdmi_phy_configure(phy, default_cfg);
- clk_disable_unprepare(phy->refclk);
- if (ret)
- return dev_err_probe(phy->dev, ret,
- "failed to configure default rate\n");
-
pm_runtime_get_noresume(phy->dev);
pm_runtime_set_active(phy->dev);
pm_runtime_enable(phy->dev);
@@ -719,7 +702,7 @@ static int __maybe_unused fsl_samsung_hdmi_phy_suspend(struct device *dev)
static int __maybe_unused fsl_samsung_hdmi_phy_resume(struct device *dev)
{
struct fsl_samsung_hdmi_phy *phy = dev_get_drvdata(dev);
- int ret;
+ int ret = 0;
ret = clk_prepare_enable(phy->apbclk);
if (ret) {
@@ -727,23 +710,11 @@ static int __maybe_unused fsl_samsung_hdmi_phy_resume(struct device *dev)
return ret;
}
- if (!phy->cur_cfg)
- return 0;
-
- ret = clk_prepare_enable(phy->refclk);
- if (ret) {
- dev_err(phy->dev, "failed to enable ref clk\n");
- goto disable_apbclk;
- }
-
- ret = fsl_samsung_hdmi_phy_configure(phy, phy->cur_cfg);
- clk_disable_unprepare(phy->refclk);
- if (!ret)
- return 0;
+ if (phy->cur_cfg)
+ ret = fsl_samsung_hdmi_phy_configure(phy, phy->cur_cfg);
-disable_apbclk:
- clk_disable_unprepare(phy->apbclk);
return ret;
+
}
static DEFINE_RUNTIME_DEV_PM_OPS(fsl_samsung_hdmi_phy_pm_ops,
--
2.47.3