]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
phy: freescale: fsl-samsung-hdmi: Simplify REG21_PMS_S_MASK lookup
authorAdam Ford <aford173@gmail.com>
Sat, 14 Sep 2024 11:27:46 +0000 (06:27 -0500)
committerVinod Koul <vkoul@kernel.org>
Thu, 17 Oct 2024 13:13:35 +0000 (18:43 +0530)
The value of 'S' is writen to two places, PHY_REG3[7:4] and
PHY_REG21[3:0].  There is a lookup table which contains
the value of PHY_REG3.  Rather than using a switch statement
based on the pixel clock to search for the value of 'S' again,
just shift the contents of PHY_REG3[7:4] >> 4 and place the value
in PHY_REG21[3:0].  Doing this can eliminate an entire function.

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Reviewed-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
Tested-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
Link: https://lore.kernel.org/r/20240914112816.520224-3-aford173@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/freescale/phy-fsl-samsung-hdmi.c

index acea7008aefc527c994f26973e98b38b26643e8c..4f6874226f9abcebda1e7571e0153579e794a203 100644 (file)
@@ -364,40 +364,6 @@ to_fsl_samsung_hdmi_phy(struct clk_hw *hw)
        return container_of(hw, struct fsl_samsung_hdmi_phy, hw);
 }
 
-static void
-fsl_samsung_hdmi_phy_configure_pixclk(struct fsl_samsung_hdmi_phy *phy,
-                                     const struct phy_config *cfg)
-{
-       u8 div = 0x1;
-
-       switch (cfg->pixclk) {
-       case  22250000 ...  33750000:
-               div = 0xf;
-               break;
-       case  35000000 ...  40000000:
-               div = 0xb;
-               break;
-       case  43200000 ...  47500000:
-               div = 0x9;
-               break;
-       case  50349650 ...  63500000:
-               div = 0x7;
-               break;
-       case  67500000 ...  90000000:
-               div = 0x5;
-               break;
-       case  94000000 ... 148500000:
-               div = 0x3;
-               break;
-       case 154000000 ... 297000000:
-               div = 0x1;
-               break;
-       }
-
-       writeb(REG21_SEL_TX_CK_INV | FIELD_PREP(REG21_PMS_S_MASK, div),
-              phy->regs + PHY_REG(21));
-}
-
 static void
 fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy,
                                            const struct phy_config *cfg)
@@ -466,7 +432,10 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,
        for (i = 0; i < PHY_PLL_DIV_REGS_NUM; i++)
                writeb(cfg->pll_div_regs[i], phy->regs + PHY_REG(2) + i * 4);
 
-       fsl_samsung_hdmi_phy_configure_pixclk(phy, cfg);
+       /* High nibble of pll_div_regs[1] contains S which also gets written to REG21 */
+       writeb(REG21_SEL_TX_CK_INV | FIELD_PREP(REG21_PMS_S_MASK,
+              cfg->pll_div_regs[1] >> 4), phy->regs + PHY_REG(21));
+
        fsl_samsung_hdmi_phy_configure_pll_lock_det(phy, cfg);
 
        writeb(REG33_FIX_DA | REG33_MODE_SET_DONE, phy->regs + PHY_REG(33));