phy: freescale: fsl-samsung-hdmi: Expand phy clock options
v7 cover phy: freescale: fsl-samsung-hdmi: Expand phy clock options
Currently, there is a look-up-table to describe all the clock options the HDMI PHY can use. Some of these entries in the LUT are using a fractional divider which does not have a well documented algorithm for determinging values, but the the integer divider can use an algorithm to calculate the integer divder values dynamically beyond those listed in the LUT and also duplicates some of the entries.
The first two patches do not do anything functionally other than simplify some of the register accesses and de-duplicates some of the register look-ups.
The third patch adds support for the integer divider and uses it whenever the clock request is an exact match. Otherwise, it will use the LUT as before. The rouding is still based on the LUT if the integer clock isn't an exact match.
The forth patch updates thes set_rate and round_rate functions to use either the fractional clock LUT or the the integer divder mechanism to determine which ever clock rate might be closest match.
The last patch removes the integer divider entries from the LUT since by then it'll be comparing both the integer divider calculator and the closest value in the LUT.
In my testing with a AOC 4K monitor, I was able to add 4 entries in my modetest table. I do not have an HDMI analyzer, so I just used my monitor to determine if this series worked.
Adam Ford (5):
phy: freescale: fsl-samsung-hdmi: Replace register defines with macro
phy: freescale: fsl-samsung-hdmi: Simplify REG21_PMS_S_MASK lookup
xphy: freescale: fsl-samsung-hdmi: Support dynamic integer
phy: freescale: fsl-samsung-hdmi: Use closest divider
phy: freescale: fsl-samsung-hdmi: Remove unnecessary LUT entries
drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 596 ++++++++++--------- 1 file changed, 318 insertions(+), 278 deletions(-)
Signature · 1 line
2.43.0
PATCH v7 1/5 phy: freescale: fsl-samsung-hdmi: Replace register defines with macro
There are 47 registers defined as PHY_REG_xx were xx goes from 00 to
47. Simplify this by replacing them all with a macro which is passed the register number to return the proper register offset.
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 133 ++++++------------- 1 file changed, 43 insertions(+), 90 deletions(-)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +43 -90
@@ -14,76 +14,29 @@#include <linux/platform_device.h> #include <linux/pm_runtime.h> -#define PHY_REG_00 0x00 -#define PHY_REG_01 0x04 -#define PHY_REG_02 0x08 -#define PHY_REG_08 0x20 -#define PHY_REG_09 0x24 -#define PHY_REG_10 0x28 -#define PHY_REG_11 0x2c - -#define PHY_REG_12 0x30 -#define REG12_CK_DIV_MASK GENMASK(5, 4) - -#define PHY_REG_13 0x34 -#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0) - -#define PHY_REG_14 0x38 -#define REG14_TOL_MASK GENMASK(7, 4) -#define REG14_RP_CODE_MASK GENMASK(3, 1) -#define REG14_TG_CODE_HIGH_MASK GENMASK(0, 0) - -#define PHY_REG_15 0x3c -#define PHY_REG_16 0x40 -#define PHY_REG_17 0x44 -#define PHY_REG_18 0x48 -#define PHY_REG_19 0x4c -#define PHY_REG_20 0x50 - -#define PHY_REG_21 0x54 -#define REG21_SEL_TX_CK_INV BIT(7) -#define REG21_PMS_S_MASK GENMASK(3, 0) - -#define PHY_REG_22 0x58 -#define PHY_REG_23 0x5c -#define PHY_REG_24 0x60 -#define PHY_REG_25 0x64 -#define PHY_REG_26 0x68 -#define PHY_REG_27 0x6c -#define PHY_REG_28 0x70 -#define PHY_REG_29 0x74 -#define PHY_REG_30 0x78 -#define PHY_REG_31 0x7c -#define PHY_REG_32 0x80 +#define PHY_REG (reg) (reg * 4) +#define REG12_CK_DIV_MASK GENMASK(5, 4) + +#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0) + +#define REG14_TOL_MASK GENMASK(7, 4) +#define REG14_RP_CODE_MASK GENMASK(3, 1) +#define REG14_TG_CODE_HIGH_MASK GENMASK(0, 0) + +#define REG21_SEL_TX_CK_INV BIT(7) +#define REG21_PMS_S_MASK GENMASK(3, 0)/* * REG33 does not match the ref manual. According to Sandor Yu from NXP, * "There is a doc issue on the i.MX8MP latest RM" * REG33 is being used per guidance from Sandor */ +#define REG33_MODE_SET_DONE BIT(7) +#define REG33_FIX_DA BIT(1) -#define PHY_REG_33 0x84 -#define REG33_MODE_SET_DONE BIT(7) -#define REG33_FIX_DA BIT(1) - -#define PHY_REG_34 0x88 -#define REG34_PHY_READY BIT(7) -#define REG34_PLL_LOCK BIT(6) -#define REG34_PHY_CLK_READY BIT(5) - -#define PHY_REG_35 0x8c -#define PHY_REG_36 0x90 -#define PHY_REG_37 0x94 -#define PHY_REG_38 0x98 -#define PHY_REG_39 0x9c -#define PHY_REG_40 0xa0 -#define PHY_REG_41 0xa4 -#define PHY_REG_42 0xa8 -#define PHY_REG_43 0xac -#define PHY_REG_44 0xb0 -#define PHY_REG_45 0xb4 -#define PHY_REG_46 0xb8 -#define PHY_REG_47 0xbc +#define REG34_PHY_READY BIT(7) +#define REG34_PLL_LOCK BIT(6) +#define REG34_PHY_CLK_READY BIT(5)#define PHY_PLL_DIV_REGS_NUM 6
@@ -369,29 +322,29 @@ struct reg_settings { };static const struct reg_settings common_phy_cfg[] = { - {PHY_REG_00 ,0x00 }, {PHY_REG_01 ,0xd1 }, - {PHY_REG_08 ,0x4f }, {PHY_REG_09 ,0x30 }, - {PHY_REG_10 ,0x33 }, {PHY_REG_11 ,0x65 }, + {PHY_REG (0 ),0x00 }, {PHY_REG (1 ),0xd1 }, + {PHY_REG (8 ),0x4f }, {PHY_REG (9 ),0x30 }, + {PHY_REG (10 ),0x33 }, {PHY_REG (11 ),0x65 },/* REG12 pixclk specific */ /* REG13 pixclk specific */ /* REG14 pixclk specific */ - {PHY_REG_15 ,0x80 }, {PHY_REG_16 ,0x6c }, - {PHY_REG_17 ,0xf2 }, {PHY_REG_18 ,0x67 }, - {PHY_REG_19 ,0x00 }, {PHY_REG_20 ,0x10 }, + {PHY_REG (15 ),0x80 }, {PHY_REG (16 ),0x6c }, + {PHY_REG (17 ),0xf2 }, {PHY_REG (18 ),0x67 }, + {PHY_REG (19 ),0x00 }, {PHY_REG (20 ),0x10 },/* REG21 pixclk specific */ - {PHY_REG_22 ,0x30 }, {PHY_REG_23 ,0x32 }, - {PHY_REG_24 ,0x60 }, {PHY_REG_25 ,0x8f }, - {PHY_REG_26 ,0x00 }, {PHY_REG_27 ,0x00 }, - {PHY_REG_28 ,0x08 }, {PHY_REG_29 ,0x00 }, - {PHY_REG_30 ,0x00 }, {PHY_REG_31 ,0x00 }, - {PHY_REG_32 ,0x00 }, {PHY_REG_33 ,0x80 }, - {PHY_REG_34 ,0x00 }, {PHY_REG_35 ,0x00 }, - {PHY_REG_36 ,0x00 }, {PHY_REG_37 ,0x00 }, - {PHY_REG_38 ,0x00 }, {PHY_REG_39 ,0x00 }, - {PHY_REG_40 ,0x00 }, {PHY_REG_41 ,0xe0 }, - {PHY_REG_42 ,0x83 }, {PHY_REG_43 ,0x0f }, - {PHY_REG_44 ,0x3E }, {PHY_REG_45 ,0xf8 }, - {PHY_REG_46 ,0x00 }, {PHY_REG_47 ,0x00 } + {PHY_REG (22 ),0x30 }, {PHY_REG (23 ),0x32 }, + {PHY_REG (24 ),0x60 }, {PHY_REG (25 ),0x8f }, + {PHY_REG (26 ),0x00 }, {PHY_REG (27 ),0x00 }, + {PHY_REG (28 ),0x08 }, {PHY_REG (29 ),0x00 }, + {PHY_REG (30 ),0x00 }, {PHY_REG (31 ),0x00 }, + {PHY_REG (32 ),0x00 }, {PHY_REG (33 ),0x80 }, + {PHY_REG (34 ),0x00 }, {PHY_REG (35 ),0x00 }, + {PHY_REG (36 ),0x00 }, {PHY_REG (37 ),0x00 }, + {PHY_REG (38 ),0x00 }, {PHY_REG (39 ),0x00 }, + {PHY_REG (40 ),0x00 }, {PHY_REG (41 ),0xe0 }, + {PHY_REG (42 ),0x83 }, {PHY_REG (43 ),0x0f }, + {PHY_REG (44 ),0x3E }, {PHY_REG (45 ),0xf8 }, + {PHY_REG (46 ),0x00 }, {PHY_REG (47 ),0x00 } };struct fsl_samsung_hdmi_phy {
@@ -442,7 +395,7 @@ fsl_samsung_hdmi_phy_configure_pixclk(struct fsl_samsung_hdmi_phy *phy, }writeb (REG21_SEL_TX_CK_INV |FIELD_PREP (REG21_PMS_S_MASK , div), - phy->regs +PHY_REG_21 ); + phy->regs +PHY_REG (21 )); } static void
@@ -469,7 +422,7 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy,break ; } -writeb (FIELD_PREP (REG12_CK_DIV_MASK ,ilog2 (div)), phy->regs +PHY_REG_12 ); +writeb (FIELD_PREP (REG12_CK_DIV_MASK ,ilog2 (div)), phy->regs +PHY_REG (12 ));/* * Calculation for the frequency lock detector target code (fld_tg_code)
@@ -489,11 +442,11 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy,/* FLD_TOL and FLD_RP_CODE taken from downstream driver */ writeb (FIELD_PREP (REG13_TG_CODE_LOW_MASK , fld_tg_code), - phy->regs +PHY_REG_13 ); + phy->regs +PHY_REG (13 ));writeb (FIELD_PREP (REG14_TOL_MASK ,2 ) |FIELD_PREP (REG14_RP_CODE_MASK ,2 ) |FIELD_PREP (REG14_TG_CODE_HIGH_MASK , fld_tg_code >>8 ), - phy->regs +PHY_REG_14 ); + phy->regs +PHY_REG (14 )); } static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,
@@ -503,7 +456,7 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,u8 val;/* HDMI PHY init */ -writeb (REG33_FIX_DA , phy->regs +PHY_REG_33 ); +writeb (REG33_FIX_DA , phy->regs +PHY_REG (33 ));/* common PHY registers */ for (i =0 ; i <ARRAY_SIZE (common_phy_cfg); i++)
@@ -511,14 +464,14 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,/* set individual PLL registers PHY_REG2 ... PHY_REG7 */ for (i =0 ; i <PHY_PLL_DIV_REGS_NUM ; i++) -writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG_02 + i *4 ); +writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (2 ) + i *4 );fsl_samsung_hdmi_phy_configure_pixclk (phy, cfg);fsl_samsung_hdmi_phy_configure_pll_lock_det (phy, cfg); -writeb (REG33_FIX_DA |REG33_MODE_SET_DONE , phy->regs +PHY_REG_33 ); +writeb (REG33_FIX_DA |REG33_MODE_SET_DONE , phy->regs +PHY_REG (33 )); - ret =readb_poll_timeout (phy->regs +PHY_REG_34 , val, + ret =readb_poll_timeout (phy->regs +PHY_REG (34 ), val, val ®34_PLL_LOCK ,50 ,20000 );if (ret)dev_err (phy->dev,"PLL failed to lock\n" );
Signature · 1 line
2.43.0
Re: [PATCH V7 1/5] phy: freescale: fsl-samsung-hdmi: Replace register defines with macro
Adam Ford wrote on Tue, Sep 10, 2024 at 08:28:07PM -0500:
Quoted 8 lines
There are 47 registers defined as
PHY_REG_xxwere xx goes from 00 to
47. Simplify this by replacing them all with a macro which is passed the register number to return the proper register offset.Signed-off-by Adam Ford <[email protected]>Reviewed-by Marco Felsch <[email protected]>Reviewed-by Frieder Schrempf <[email protected]>Tested-by Frieder Schrempf <[email protected]>
Quoted 209 lines
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 133 ++++++------------- 1 file changed, 43 insertions(+), 90 deletions(-)drivers/phy/freescale/phy-fsl-samsung-hdmi.c +43
-90@@ -14,76 +14,29 @@#include <linux/platform_device.h> #include <linux/pm_runtime.h> -#define PHY_REG_00 0x00 -#define PHY_REG_01 0x04 -#define PHY_REG_02 0x08 -#define PHY_REG_08 0x20 -#define PHY_REG_09 0x24 -#define PHY_REG_10 0x28 -#define PHY_REG_11 0x2c - -#define PHY_REG_12 0x30 -#define REG12_CK_DIV_MASK GENMASK(5, 4) - -#define PHY_REG_13 0x34 -#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0) - -#define PHY_REG_14 0x38 -#define REG14_TOL_MASK GENMASK(7, 4) -#define REG14_RP_CODE_MASK GENMASK(3, 1) -#define REG14_TG_CODE_HIGH_MASK GENMASK(0, 0) - -#define PHY_REG_15 0x3c -#define PHY_REG_16 0x40 -#define PHY_REG_17 0x44 -#define PHY_REG_18 0x48 -#define PHY_REG_19 0x4c -#define PHY_REG_20 0x50 - -#define PHY_REG_21 0x54 -#define REG21_SEL_TX_CK_INV BIT(7) -#define REG21_PMS_S_MASK GENMASK(3, 0) - -#define PHY_REG_22 0x58 -#define PHY_REG_23 0x5c -#define PHY_REG_24 0x60 -#define PHY_REG_25 0x64 -#define PHY_REG_26 0x68 -#define PHY_REG_27 0x6c -#define PHY_REG_28 0x70 -#define PHY_REG_29 0x74 -#define PHY_REG_30 0x78 -#define PHY_REG_31 0x7c -#define PHY_REG_32 0x80 +#define PHY_REG (reg) (reg * 4) +#define REG12_CK_DIV_MASK GENMASK(5, 4) + +#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0) + +#define REG14_TOL_MASK GENMASK(7, 4) +#define REG14_RP_CODE_MASK GENMASK(3, 1) +#define REG14_TG_CODE_HIGH_MASK GENMASK(0, 0) + +#define REG21_SEL_TX_CK_INV BIT(7) +#define REG21_PMS_S_MASK GENMASK(3, 0)/* * REG33 does not match the ref manual. According to Sandor Yu from NXP, * "There is a doc issue on the i.MX8MP latest RM" * REG33 is being used per guidance from Sandor */ +#define REG33_MODE_SET_DONE BIT(7) +#define REG33_FIX_DA BIT(1) -#define PHY_REG_33 0x84 -#define REG33_MODE_SET_DONE BIT(7) -#define REG33_FIX_DA BIT(1) - -#define PHY_REG_34 0x88 -#define REG34_PHY_READY BIT(7) -#define REG34_PLL_LOCK BIT(6) -#define REG34_PHY_CLK_READY BIT(5) - -#define PHY_REG_35 0x8c -#define PHY_REG_36 0x90 -#define PHY_REG_37 0x94 -#define PHY_REG_38 0x98 -#define PHY_REG_39 0x9c -#define PHY_REG_40 0xa0 -#define PHY_REG_41 0xa4 -#define PHY_REG_42 0xa8 -#define PHY_REG_43 0xac -#define PHY_REG_44 0xb0 -#define PHY_REG_45 0xb4 -#define PHY_REG_46 0xb8 -#define PHY_REG_47 0xbc +#define REG34_PHY_READY BIT(7) +#define REG34_PLL_LOCK BIT(6) +#define REG34_PHY_CLK_READY BIT(5)#define PHY_PLL_DIV_REGS_NUM 6@@ -369,29 +322,29 @@ struct reg_settings { };static const struct reg_settings common_phy_cfg[] = { - {PHY_REG_00 ,0x00 }, {PHY_REG_01 ,0xd1 }, - {PHY_REG_08 ,0x4f }, {PHY_REG_09 ,0x30 }, - {PHY_REG_10 ,0x33 }, {PHY_REG_11 ,0x65 }, + {PHY_REG (0 ),0x00 }, {PHY_REG (1 ),0xd1 }, + {PHY_REG (8 ),0x4f }, {PHY_REG (9 ),0x30 }, + {PHY_REG (10 ),0x33 }, {PHY_REG (11 ),0x65 },/* REG12 pixclk specific */ /* REG13 pixclk specific */ /* REG14 pixclk specific */ - {PHY_REG_15 ,0x80 }, {PHY_REG_16 ,0x6c }, - {PHY_REG_17 ,0xf2 }, {PHY_REG_18 ,0x67 }, - {PHY_REG_19 ,0x00 }, {PHY_REG_20 ,0x10 }, + {PHY_REG (15 ),0x80 }, {PHY_REG (16 ),0x6c }, + {PHY_REG (17 ),0xf2 }, {PHY_REG (18 ),0x67 }, + {PHY_REG (19 ),0x00 }, {PHY_REG (20 ),0x10 },/* REG21 pixclk specific */ - {PHY_REG_22 ,0x30 }, {PHY_REG_23 ,0x32 }, - {PHY_REG_24 ,0x60 }, {PHY_REG_25 ,0x8f }, - {PHY_REG_26 ,0x00 }, {PHY_REG_27 ,0x00 }, - {PHY_REG_28 ,0x08 }, {PHY_REG_29 ,0x00 }, - {PHY_REG_30 ,0x00 }, {PHY_REG_31 ,0x00 }, - {PHY_REG_32 ,0x00 }, {PHY_REG_33 ,0x80 }, - {PHY_REG_34 ,0x00 }, {PHY_REG_35 ,0x00 }, - {PHY_REG_36 ,0x00 }, {PHY_REG_37 ,0x00 }, - {PHY_REG_38 ,0x00 }, {PHY_REG_39 ,0x00 }, - {PHY_REG_40 ,0x00 }, {PHY_REG_41 ,0xe0 }, - {PHY_REG_42 ,0x83 }, {PHY_REG_43 ,0x0f }, - {PHY_REG_44 ,0x3E }, {PHY_REG_45 ,0xf8 }, - {PHY_REG_46 ,0x00 }, {PHY_REG_47 ,0x00 } + {PHY_REG (22 ),0x30 }, {PHY_REG (23 ),0x32 }, + {PHY_REG (24 ),0x60 }, {PHY_REG (25 ),0x8f }, + {PHY_REG (26 ),0x00 }, {PHY_REG (27 ),0x00 }, + {PHY_REG (28 ),0x08 }, {PHY_REG (29 ),0x00 }, + {PHY_REG (30 ),0x00 }, {PHY_REG (31 ),0x00 }, + {PHY_REG (32 ),0x00 }, {PHY_REG (33 ),0x80 }, + {PHY_REG (34 ),0x00 }, {PHY_REG (35 ),0x00 }, + {PHY_REG (36 ),0x00 }, {PHY_REG (37 ),0x00 }, + {PHY_REG (38 ),0x00 }, {PHY_REG (39 ),0x00 }, + {PHY_REG (40 ),0x00 }, {PHY_REG (41 ),0xe0 }, + {PHY_REG (42 ),0x83 }, {PHY_REG (43 ),0x0f }, + {PHY_REG (44 ),0x3E }, {PHY_REG (45 ),0xf8 }, + {PHY_REG (46 ),0x00 }, {PHY_REG (47 ),0x00 } };struct fsl_samsung_hdmi_phy {@@ -442,7 +395,7 @@ fsl_samsung_hdmi_phy_configure_pixclk(struct fsl_samsung_hdmi_phy *phy, }writeb (REG21_SEL_TX_CK_INV |FIELD_PREP (REG21_PMS_S_MASK , div), - phy->regs +PHY_REG_21 ); + phy->regs +PHY_REG (21 )); } static void@@ -469,7 +422,7 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy,break ; } -writeb (FIELD_PREP (REG12_CK_DIV_MASK ,ilog2 (div)), phy->regs +PHY_REG_12 ); +writeb (FIELD_PREP (REG12_CK_DIV_MASK ,ilog2 (div)), phy->regs +PHY_REG (12 ));/* * Calculation for the frequency lock detector target code (fld_tg_code) @@ -489,11 +442,11 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy,/* FLD_TOL and FLD_RP_CODE taken from downstream driver */ writeb (FIELD_PREP (REG13_TG_CODE_LOW_MASK , fld_tg_code), - phy->regs +PHY_REG_13 ); + phy->regs +PHY_REG (13 ));writeb (FIELD_PREP (REG14_TOL_MASK ,2 ) |FIELD_PREP (REG14_RP_CODE_MASK ,2 ) |FIELD_PREP (REG14_TG_CODE_HIGH_MASK , fld_tg_code >>8 ), - phy->regs +PHY_REG_14 ); + phy->regs +PHY_REG (14 )); } static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,@@ -503,7 +456,7 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,u8 val;/* HDMI PHY init */ -writeb (REG33_FIX_DA , phy->regs +PHY_REG_33 ); +writeb (REG33_FIX_DA , phy->regs +PHY_REG (33 ));/* common PHY registers */ for (i =0 ; i <ARRAY_SIZE (common_phy_cfg); i++)@@ -511,14 +464,14 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,/* set individual PLL registers PHY_REG2 ... PHY_REG7 */ for (i =0 ; i <PHY_PLL_DIV_REGS_NUM ; i++) -writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG_02 + i *4 ); +writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (2 ) + i *4 );fsl_samsung_hdmi_phy_configure_pixclk (phy, cfg);fsl_samsung_hdmi_phy_configure_pll_lock_det (phy, cfg); -writeb (REG33_FIX_DA |REG33_MODE_SET_DONE , phy->regs +PHY_REG_33 ); +writeb (REG33_FIX_DA |REG33_MODE_SET_DONE , phy->regs +PHY_REG (33 )); - ret =readb_poll_timeout (phy->regs +PHY_REG_34 , val, + ret =readb_poll_timeout (phy->regs +PHY_REG (34 ), val, val ®34_PLL_LOCK ,50 ,20000 );if (ret)dev_err (phy->dev,"PLL failed to lock\n" );
PATCH v7 2/5 phy: freescale: fsl-samsung-hdmi: Simplify REG21_PMS_S_MASK lookup
In reply to Adam FordThe 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.
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 39 ++------------------ 1 file changed, 4 insertions(+), 35 deletions(-)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +4 -35
@@ -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 ));
Signature · 1 line
2.43.0
Re: [PATCH V7 2/5] phy: freescale: fsl-samsung-hdmi: Simplify REG21_PMS_S_MASK lookup
Adam Ford wrote on Tue, Sep 10, 2024 at 08:28:08PM -0500:
Quoted 11 lines
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 <[email protected]>Reviewed-by Marco Felsch <[email protected]>Reviewed-by Frieder Schrempf <[email protected]>Tested-by Frieder Schrempf <[email protected]>
Quoted 61 lines
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 39 ++------------------ 1 file changed, 4 insertions(+), 35 deletions(-)drivers/phy/freescale/phy-fsl-samsung-hdmi.c +4
-35@@ -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 ));
PATCH v7 3/5 xphy: freescale: fsl-samsung-hdmi: Support dynamic integer
In reply to Adam FordThere is currently a look-up table for a variety of resolutions. Since the phy has the ability to dynamically calculate the values necessary to use the intger divider which should allow more resolutions without having to update the look-up-table.
If the lookup table cannot find an exact match, fall back to the dynamic calculator of the integer divider.
Previously, the value of P was hard-coded to 1, this required an update to the phy_pll_cfg table to add in the extra value into the table, so if the value of P is calculated to be something else by the PMS calculator, the calculated_phy_pll_cfg structure can be used instead without having to keep track of which method was used.
---
V7: Refactored much of the code to create smaller helper functions
to eliminate redundant code and improve code flow and comment
readability. Any t-b and s-o-b tags removed due to the
extent of the changes.
V6: Fix comment typos and remove an unnecesary extra calculation
by using the cached value.
V5: No Change V4: No Change V3: Change size of pll_div_regs to include PHY_REG01 (P)
Create calculated_phy_pll_cfg to containe the values Eliminate the PMS calculation from fsl_samsung_hdmi_phy_configure Make the LUT primary and fall back to integer calculator in phy_clk_round_rate.
Check the range right away to ensure it's reaonsable rather than trying to find a clock only to learn it's outside the range. Overall added notes and comments where stuff may not be intuitive.
V2: Update phy_clk_round_rate and phy_clk_set_rate to both support
the integer clock PMS calculator.
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 371 +++++++++++++------ 1 file changed, 265 insertions(+), 106 deletions(-)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +265 -106
@@ -16,6 +16,8 @@#define PHY_REG (reg) (reg * 4) +#define REG01_PMS_P_MASK GENMASK(3, 0) +#define REG03_PMS_S_MASK GENMASK(7, 4)#define REG12_CK_DIV_MASK GENMASK(5, 4)#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0)
@@ -38,281 +40,296 @@#define REG34_PLL_LOCK BIT(6)#define REG34_PHY_CLK_READY BIT(5) -#define PHY_PLL_DIV_REGS_NUM 6 +#ifndef MHZ +#define MHZ (1000UL * 1000UL) +#endif + +#define PHY_PLL_DIV_REGS_NUM 7struct phy_config {u32 pixclk;u8 pll_div_regs[PHY_PLL_DIV_REGS_NUM ]; }; +/* +* The calculated_phy_pll_cfg only handles integer divider for PMS, +* meaning the last four entries will be fixed, but the first three will +* be calculated by the PMS calculator. +*/ +static struct phy_config calculated_phy_pll_cfg = { + .pixclk =0 , + .pll_div_regs = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x80 ,0x00 }, +}; + +/* The lookup table contains values for which the fractional divder is used */ static const struct phy_config phy_pll_cfg[] = { { .pixclk =22250000 , - .pll_div_regs = {0x4b ,0xf1 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4b ,0xf1 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =23750000 , - .pll_div_regs = {0x50 ,0xf1 ,0x86 ,0x85 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x50 ,0xf1 ,0x86 ,0x85 ,0x80 ,0x40 }, }, { .pixclk =24000000 , - .pll_div_regs = {0x50 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x50 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =24024000 , - .pll_div_regs = {0x50 ,0xf1 ,0x99 ,0x02 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x50 ,0xf1 ,0x99 ,0x02 ,0x80 ,0x40 }, }, { .pixclk =25175000 , - .pll_div_regs = {0x54 ,0xfc ,0xcc ,0x91 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0xfc ,0xcc ,0x91 ,0x80 ,0x40 }, }, { .pixclk =25200000 , - .pll_div_regs = {0x54 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x54 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =26750000 , - .pll_div_regs = {0x5a ,0xf2 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0xf2 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =27000000 , - .pll_div_regs = {0x5a ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =27027000 , - .pll_div_regs = {0x5a ,0xf2 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0xf2 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =29500000 , - .pll_div_regs = {0x62 ,0xf4 ,0x95 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0xf4 ,0x95 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =30750000 , - .pll_div_regs = {0x66 ,0xf4 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0xf4 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =30888000 , - .pll_div_regs = {0x66 ,0xf4 ,0x99 ,0x18 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0xf4 ,0x99 ,0x18 ,0x88 ,0x45 }, }, { .pixclk =33750000 , - .pll_div_regs = {0x70 ,0xf4 ,0x82 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0xf4 ,0x82 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =35000000 , - .pll_div_regs = {0x58 ,0xb8 ,0x8b ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x58 ,0xb8 ,0x8b ,0x88 ,0x80 ,0x40 }, }, { .pixclk =36000000 , - .pll_div_regs = {0x5a ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =36036000 , - .pll_div_regs = {0x5a ,0xb2 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0xb2 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =40000000 , - .pll_div_regs = {0x64 ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x64 ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =43200000 , - .pll_div_regs = {0x5a ,0x90 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x90 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =43243200 , - .pll_div_regs = {0x5a ,0x92 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x92 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =44500000 , - .pll_div_regs = {0x5c ,0x92 ,0x98 ,0x11 ,0x84 ,0x41 }, + .pll_div_regs = {0xd1 ,0x5c ,0x92 ,0x98 ,0x11 ,0x84 ,0x41 }, }, { .pixclk =47000000 , - .pll_div_regs = {0x62 ,0x94 ,0x95 ,0x82 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x94 ,0x95 ,0x82 ,0x80 ,0x40 }, }, { .pixclk =47500000 , - .pll_div_regs = {0x63 ,0x96 ,0xa1 ,0x82 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x63 ,0x96 ,0xa1 ,0x82 ,0x80 ,0x40 }, }, { .pixclk =50349650 , - .pll_div_regs = {0x54 ,0x7c ,0xc3 ,0x8f ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0x7c ,0xc3 ,0x8f ,0x80 ,0x40 }, }, { .pixclk =50400000 , - .pll_div_regs = {0x54 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x54 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =53250000 , - .pll_div_regs = {0x58 ,0x72 ,0x84 ,0x03 ,0x82 ,0x41 }, + .pll_div_regs = {0xd1 ,0x58 ,0x72 ,0x84 ,0x03 ,0x82 ,0x41 }, }, { .pixclk =53500000 , - .pll_div_regs = {0x5a ,0x72 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x72 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =54000000 , - .pll_div_regs = {0x5a ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =54054000 , - .pll_div_regs = {0x5a ,0x72 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x72 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =59000000 , - .pll_div_regs = {0x62 ,0x74 ,0x95 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x74 ,0x95 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =59340659 , - .pll_div_regs = {0x62 ,0x74 ,0xdb ,0x52 ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x62 ,0x74 ,0xdb ,0x52 ,0x88 ,0x47 }, }, { .pixclk =59400000 , - .pll_div_regs = {0x63 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x63 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =61500000 , - .pll_div_regs = {0x66 ,0x74 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0x74 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =63500000 , - .pll_div_regs = {0x69 ,0x74 ,0x89 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x69 ,0x74 ,0x89 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =67500000 , - .pll_div_regs = {0x54 ,0x52 ,0x87 ,0x03 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0x52 ,0x87 ,0x03 ,0x80 ,0x40 }, }, { .pixclk =70000000 , - .pll_div_regs = {0x58 ,0x58 ,0x8b ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x58 ,0x58 ,0x8b ,0x88 ,0x80 ,0x40 }, }, { .pixclk =72000000 , - .pll_div_regs = {0x5a ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =72072000 , - .pll_div_regs = {0x5a ,0x52 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x52 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =74176000 , - .pll_div_regs = {0x5d ,0x58 ,0xdb ,0xA2 ,0x88 ,0x41 }, + .pll_div_regs = {0xd1 ,0x5d ,0x58 ,0xdb ,0xA2 ,0x88 ,0x41 }, }, { .pixclk =74250000 , - .pll_div_regs = {0x5c ,0x52 ,0x90 ,0x0d ,0x84 ,0x41 }, + .pll_div_regs = {0xd1 ,0x5c ,0x52 ,0x90 ,0x0d ,0x84 ,0x41 }, }, { .pixclk =78500000 , - .pll_div_regs = {0x62 ,0x54 ,0x87 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x54 ,0x87 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =80000000 , - .pll_div_regs = {0x64 ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x64 ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =82000000 , - .pll_div_regs = {0x66 ,0x54 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0x54 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =82500000 , - .pll_div_regs = {0x67 ,0x54 ,0x88 ,0x01 ,0x90 ,0x49 }, + .pll_div_regs = {0xd1 ,0x67 ,0x54 ,0x88 ,0x01 ,0x90 ,0x49 }, }, { .pixclk =89000000 , - .pll_div_regs = {0x70 ,0x54 ,0x84 ,0x83 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0x54 ,0x84 ,0x83 ,0x80 ,0x40 }, }, { .pixclk =90000000 , - .pll_div_regs = {0x70 ,0x54 ,0x82 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0x54 ,0x82 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =94000000 , - .pll_div_regs = {0x4e ,0x32 ,0xa7 ,0x10 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4e ,0x32 ,0xa7 ,0x10 ,0x80 ,0x40 }, }, { .pixclk =95000000 , - .pll_div_regs = {0x50 ,0x31 ,0x86 ,0x85 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x50 ,0x31 ,0x86 ,0x85 ,0x80 ,0x40 }, }, { .pixclk =98901099 , - .pll_div_regs = {0x52 ,0x3a ,0xdb ,0x4c ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x52 ,0x3a ,0xdb ,0x4c ,0x88 ,0x47 }, }, { .pixclk =99000000 , - .pll_div_regs = {0x52 ,0x32 ,0x82 ,0x01 ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x52 ,0x32 ,0x82 ,0x01 ,0x88 ,0x47 }, }, { .pixclk =100699300 , - .pll_div_regs = {0x54 ,0x3c ,0xc3 ,0x8f ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0x3c ,0xc3 ,0x8f ,0x80 ,0x40 }, }, { .pixclk =100800000 , - .pll_div_regs = {0x54 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x54 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =102500000 , - .pll_div_regs = {0x55 ,0x32 ,0x8c ,0x05 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x55 ,0x32 ,0x8c ,0x05 ,0x90 ,0x4b }, }, { .pixclk =104750000 , - .pll_div_regs = {0x57 ,0x32 ,0x98 ,0x07 ,0x90 ,0x49 }, + .pll_div_regs = {0xd1 ,0x57 ,0x32 ,0x98 ,0x07 ,0x90 ,0x49 }, }, { .pixclk =106500000 , - .pll_div_regs = {0x58 ,0x32 ,0x84 ,0x03 ,0x82 ,0x41 }, + .pll_div_regs = {0xd1 ,0x58 ,0x32 ,0x84 ,0x03 ,0x82 ,0x41 }, }, { .pixclk =107000000 , - .pll_div_regs = {0x5a ,0x32 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x32 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =108000000 , - .pll_div_regs = {0x5a ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =108108000 , - .pll_div_regs = {0x5a ,0x32 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x32 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =118000000 , - .pll_div_regs = {0x62 ,0x34 ,0x95 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x34 ,0x95 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =118800000 , - .pll_div_regs = {0x63 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x63 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =123000000 , - .pll_div_regs = {0x66 ,0x34 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0x34 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =127000000 , - .pll_div_regs = {0x69 ,0x34 ,0x89 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x69 ,0x34 ,0x89 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =135000000 , - .pll_div_regs = {0x70 ,0x34 ,0x82 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0x34 ,0x82 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =135580000 , - .pll_div_regs = {0x71 ,0x39 ,0xe9 ,0x82 ,0x9c ,0x5b }, + .pll_div_regs = {0xd1 ,0x71 ,0x39 ,0xe9 ,0x82 ,0x9c ,0x5b }, }, { .pixclk =137520000 , - .pll_div_regs = {0x72 ,0x38 ,0x99 ,0x10 ,0x85 ,0x41 }, + .pll_div_regs = {0xd1 ,0x72 ,0x38 ,0x99 ,0x10 ,0x85 ,0x41 }, }, { .pixclk =138750000 , - .pll_div_regs = {0x73 ,0x35 ,0x88 ,0x05 ,0x90 ,0x4d }, + .pll_div_regs = {0xd1 ,0x73 ,0x35 ,0x88 ,0x05 ,0x90 ,0x4d }, }, { .pixclk =140000000 , - .pll_div_regs = {0x75 ,0x36 ,0xa7 ,0x90 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x75 ,0x36 ,0xa7 ,0x90 ,0x80 ,0x40 }, }, { .pixclk =144000000 , - .pll_div_regs = {0x78 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x78 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =148352000 , - .pll_div_regs = {0x7b ,0x35 ,0xdb ,0x39 ,0x90 ,0x45 }, + .pll_div_regs = {0xd1 ,0x7b ,0x35 ,0xdb ,0x39 ,0x90 ,0x45 }, }, { .pixclk =148500000 , - .pll_div_regs = {0x7b ,0x35 ,0x84 ,0x03 ,0x90 ,0x45 }, + .pll_div_regs = {0xd1 ,0x7b ,0x35 ,0x84 ,0x03 ,0x90 ,0x45 }, }, { .pixclk =154000000 , - .pll_div_regs = {0x40 ,0x18 ,0x83 ,0x01 ,0x00 ,0x40 }, + .pll_div_regs = {0xd1 ,0x40 ,0x18 ,0x83 ,0x01 ,0x00 ,0x40 }, }, { .pixclk =157000000 , - .pll_div_regs = {0x41 ,0x11 ,0xa7 ,0x14 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x41 ,0x11 ,0xa7 ,0x14 ,0x80 ,0x40 }, }, { .pixclk =160000000 , - .pll_div_regs = {0x42 ,0x12 ,0xa1 ,0x20 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x42 ,0x12 ,0xa1 ,0x20 ,0x80 ,0x40 }, }, { .pixclk =162000000 , - .pll_div_regs = {0x43 ,0x18 ,0x8b ,0x08 ,0x96 ,0x55 }, + .pll_div_regs = {0xd1 ,0x43 ,0x18 ,0x8b ,0x08 ,0x96 ,0x55 }, }, { .pixclk =164000000 , - .pll_div_regs = {0x45 ,0x11 ,0x83 ,0x82 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x45 ,0x11 ,0x83 ,0x82 ,0x90 ,0x4b }, }, { .pixclk =165000000 , - .pll_div_regs = {0x45 ,0x11 ,0x84 ,0x81 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x45 ,0x11 ,0x84 ,0x81 ,0x90 ,0x4b }, }, { .pixclk =180000000 , - .pll_div_regs = {0x4b ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x4b ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =185625000 , - .pll_div_regs = {0x4e ,0x12 ,0x9a ,0x95 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4e ,0x12 ,0x9a ,0x95 ,0x80 ,0x40 }, }, { .pixclk =188000000 , - .pll_div_regs = {0x4e ,0x12 ,0xa7 ,0x10 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4e ,0x12 ,0xa7 ,0x10 ,0x80 ,0x40 }, }, { .pixclk =198000000 , - .pll_div_regs = {0x52 ,0x12 ,0x82 ,0x01 ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x52 ,0x12 ,0x82 ,0x01 ,0x88 ,0x47 }, }, { .pixclk =205000000 , - .pll_div_regs = {0x55 ,0x12 ,0x8c ,0x05 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x55 ,0x12 ,0x8c ,0x05 ,0x90 ,0x4b }, }, { .pixclk =209500000 , - .pll_div_regs = {0x57 ,0x12 ,0x98 ,0x07 ,0x90 ,0x49 }, + .pll_div_regs = {0xd1 ,0x57 ,0x12 ,0x98 ,0x07 ,0x90 ,0x49 }, }, { .pixclk =213000000 , - .pll_div_regs = {0x58 ,0x12 ,0x84 ,0x03 ,0x82 ,0x41 }, + .pll_div_regs = {0xd1 ,0x58 ,0x12 ,0x84 ,0x03 ,0x82 ,0x41 }, }, { .pixclk =216000000 , - .pll_div_regs = {0x5a ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =216216000 , - .pll_div_regs = {0x5a ,0x12 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x12 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =237600000 , - .pll_div_regs = {0x63 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x63 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =254000000 , - .pll_div_regs = {0x69 ,0x14 ,0x89 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x69 ,0x14 ,0x89 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =277500000 , - .pll_div_regs = {0x73 ,0x15 ,0x88 ,0x05 ,0x90 ,0x4d }, + .pll_div_regs = {0xd1 ,0x73 ,0x15 ,0x88 ,0x05 ,0x90 ,0x4d }, }, { .pixclk =288000000 , - .pll_div_regs = {0x78 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x78 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =297000000 , - .pll_div_regs = {0x7b ,0x15 ,0x84 ,0x03 ,0x90 ,0x45 }, + .pll_div_regs = {0xd1 ,0x7b ,0x15 ,0x84 ,0x03 ,0x90 ,0x45 }, }, };
@@ -322,7 +339,8 @@ struct reg_settings { };static const struct reg_settings common_phy_cfg[] = { - {PHY_REG (0 ),0x00 }, {PHY_REG (1 ),0xd1 }, + {PHY_REG (0 ),0x00 }, +/* PHY_REG(1-7) pix clk specific */ {PHY_REG (8 ),0x4f }, {PHY_REG (9 ),0x30 }, {PHY_REG (10 ),0x33 }, {PHY_REG (11 ),0x65 },/* REG12 pixclk specific */
@@ -415,6 +433,83 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy, phy->regs + PHY_REG(14)); } +static unsigned long fsl_samsung_hdmi_phy_find_pms (unsigned long fout,u8 *p,u16 *m,u8 *s) +{ +unsigned long best_freq =0 ; +u32 min_delta =0xffffffff ; +u8 _p, best_p; +u16 _m, best_m; +u8 _s, best_s; + +/* +* Figure 13-78 of the reference manual states the PLL should be TMDS x 5 +* while the TMDS_CLKO should be the PLL / 5. So to calculate the PLL, +* take the pix clock x 5, then return the value of the PLL / 5. +*/ + fout *=5 ; + +/* The ref manual states the values of 'P' range from 1 to 11 */ +for (_p =1 ; _p <=11 ; ++_p) { +for (_s =1 ; _s <=16 ; ++_s) { +u64 tmp; +u32 delta; + +/* s must be one or even */ +if (_s >1 && (_s &0x01 ) ==1 ) + _s++; + +/* _s cannot be 14 per the TRM */ +if (_s ==14 ) +continue ; + +/* +* TODO: Ref Manual doesn't state the range of _m +* so this should be further refined if possible. +* This range was set based on the original values +* in the lookup table +*/ + tmp = (u64 )fout * (_p * _s); +do_div (tmp,24 *MHZ ); + _m = tmp; +if (_m <0x30 || _m >0x7b ) +continue ; + +/* +* Rev 2 of the Ref Manual states the +* VCO can range between 750MHz and +* 3GHz. The VCO is assumed to be +* is assumed to be (M * f_ref) / P, +* where f_ref is 24MHz. +*/ + tmp = (u64 )_m *24 *MHZ ; +do_div (tmp, _p); +if (tmp <750 *MHZ || + tmp >3000 *MHZ ) +continue ; + +/* Final frequency after post-divider */ +do_div (tmp, _s); + + delta =abs (fout - tmp); +if (delta < min_delta) { + best_p = _p; + best_s = _s; + best_m = _m; + min_delta = delta; + best_freq = tmp; + } + } + } + +if (best_freq) { + *p = best_p; + *m = best_m; + *s = best_s; + } + +return best_freq /5 ; +} +static int fsl_samsung_hdmi_phy_configure (struct fsl_samsung_hdmi_phy *phy,const struct phy_config *cfg) {
@@ -428,13 +523,13 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,for (i =0 ; i <ARRAY_SIZE (common_phy_cfg); i++)writeb (common_phy_cfg[i].val, phy->regs + common_phy_cfg[i].reg); -/* set individual PLL registers PHY_REG2 ... PHY_REG7 */ +/* set individual PLL registers PHY_REG1 ... PHY_REG7 */ for (i =0 ; i <PHY_PLL_DIV_REGS_NUM ; i++) -writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (2 ) + i *4 ); +writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (1 ) + i *4 ); -/* High nibble of pll_div_regs[1] contains S which also gets written to REG21 */ +/* High nibble of PHY_REG3 and low nibble of PHY_REG21 both contain 'S' */ writeb (REG21_SEL_TX_CK_INV |FIELD_PREP (REG21_PMS_S_MASK , - cfg->pll_div_regs[1 ] >>4 ), phy->regs +PHY_REG (21 )); + cfg->pll_div_regs[2 ] >>4 ), phy->regs +PHY_REG (21 ));fsl_samsung_hdmi_phy_configure_pll_lock_det (phy, cfg);
@@ -459,33 +554,97 @@ static unsigned long phy_clk_recalc_rate(struct clk_hw *hw,return phy->cur_cfg->pixclk; } -static long phy_clk_round_rate (struct clk_hw *hw, -unsigned long rate,unsigned long *parent_rate) +/* Helper function to lookup the available fractional-divider rate */ +static const struct phy_config *fsl_samsung_hdmi_phy_lookup_rate (unsigned long rate) {int i; +/* Search the lookup table */ for (i =ARRAY_SIZE (phy_pll_cfg) -1 ; i >=0 ; i--)if (phy_pll_cfg[i].pixclk <= rate) -return phy_pll_cfg[i].pixclk; +break ; -return -EINVAL ; +return &phy_pll_cfg[i]; +} + +static void fsl_samsung_hdmi_calculate_phy (struct phy_config *cal_phy,unsigned long rate, +u8 p,u16 m,u8 s) +{ + cal_phy->pixclk = rate; + cal_phy->pll_div_regs[0 ] =FIELD_PREP (REG01_PMS_P_MASK , p); + cal_phy->pll_div_regs[1 ] = m; + cal_phy->pll_div_regs[2 ] =FIELD_PREP (REG03_PMS_S_MASK , s-1 ); +/* pll_div_regs 3-6 are fixed and pre-defined already */ +} + +static long phy_clk_round_rate (struct clk_hw *hw, +unsigned long rate,unsigned long *parent_rate) +{ +const struct phy_config *fract_div_phy; +u32 int_div_clk; +u16 m; +u8 p, s; + +/* If the clock is out of range return error instead of searching */ +if (rate >297000000 || rate <22250000 ) +return -EINVAL ; + +/* Search the fractional divider lookup table */ + fract_div_phy =fsl_samsung_hdmi_phy_lookup_rate (rate); + +/* If the rate is an exact match, return that value */ +if (rate == fract_div_phy->pixclk) +return fract_div_phy->pixclk; + +/* If the exact match isn't found, calculate the integer divider */ + int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); + +/* If the int_div_clk rate is an exact match, return that value */ +if (int_div_clk == rate) +return int_div_clk; + +/* If neither rate is an exact match, use the value from the LUT */ +return fract_div_phy->pixclk; }static int phy_clk_set_rate (struct clk_hw *hw,unsigned long rate,unsigned long parent_rate) {struct fsl_samsung_hdmi_phy *phy =to_fsl_samsung_hdmi_phy (hw); -int i; +const struct phy_config *fract_div_phy; +u32 int_div_clk; +u16 m; +u8 p, s; -for (i =ARRAY_SIZE (phy_pll_cfg) -1 ; i >=0 ; i--) -if (phy_pll_cfg[i].pixclk <= rate) -break ; +/* Search the fractional divider lookup table */ + fract_div_phy =fsl_samsung_hdmi_phy_lookup_rate (rate); -if (i <0 ) -return -EINVAL ; +/* If the rate is an exact match, use that value */ +if (fract_div_phy->pixclk == rate) + goto use_fract_div; - phy->cur_cfg = &phy_pll_cfg[i]; +/* +* If the rate from the fractional divder is not exact, check the integer divider, +* and use it if that value is an exact match. +*/ + int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); +if (int_div_clk == rate) { +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , + int_div_clk); + +fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s); + phy->cur_cfg = &calculated_phy_pll_cfg; +return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); + } +/* +* If neither the fractional divder nor the integer divder can find an exact value +* fall back to using the fractional divider +*/ +use_fract_div: + phy->cur_cfg = fract_div_phy; +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , + phy->cur_cfg->pixclk);return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); }
Signature · 1 line
2.43.0
Re: [PATCH V7 3/5] xphy: freescale: fsl-samsung-hdmi: Support dynamic integer
Adam Ford wrote on Tue, Sep 10, 2024 at 08:28:09PM -0500:
Quoted 1 line
Subject: ... xphy: freescale: ...
the 'phy' gained an x
Quoted 8 lines
There is currently a look-up table for a variety of resolutions. Since the phy has the ability to dynamically calculate the values necessary to use the intger divider which should allow more resolutions without having to update the look-up-table.
If the lookup table cannot find an exact match, fall back to the dynamic calculator of the integer divider.
Quoted 8 lines
Previously, the value of P was hard-coded to 1, this required an update to the
phy_pll_cfgtable to add in the extra value into the table, so if the value of P is calculated to be something else by the PMS calculator, thecalculated_phy_pll_cfgstructure can be used instead without having to keep track of which method was used.Signed-off-by Adam Ford <[email protected]>
Quoted 646 lines
---
V7: Refactored much of the code to create smaller helper functions
to eliminate redundant code and improve code flow and comment
readability. Any t-b and s-o-b tags removed due to the
extent of the changes.V6: Fix comment typos and remove an unnecesary extra calculation
by using the cached value.V5: No Change V4: No Change V3: Change size of pll_div_regs to include PHY_REG01 (P)Create
calculated_phy_pll_cfgto containe the values Eliminate the PMS calculation fromfsl_samsung_hdmi_phy_configureMake the LUT primary and fall back to integer calculator inphy_clk_round_rate.
Check the range right away to ensure it's reaonsable rather than trying to find a clock only to learn it's outside the range. Overall added notes and comments where stuff may not be intuitive.V2: Update
phy_clk_round_rateandphy_clk_set_rateto both support
the integer clock PMS calculator.--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 371 +++++++++++++------ 1 file changed, 265 insertions(+), 106 deletions(-)drivers/phy/freescale/phy-fsl-samsung-hdmi.c +265
-106@@ -16,6 +16,8 @@#define PHY_REG (reg) (reg * 4) +#define REG01_PMS_P_MASK GENMASK(3, 0) +#define REG03_PMS_S_MASK GENMASK(7, 4)#define REG12_CK_DIV_MASK GENMASK(5, 4)#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0)@@ -38,281 +40,296 @@#define REG34_PLL_LOCK BIT(6)#define REG34_PHY_CLK_READY BIT(5) -#define PHY_PLL_DIV_REGS_NUM 6 +#ifndef MHZ +#define MHZ (1000UL * 1000UL) +#endif + +#define PHY_PLL_DIV_REGS_NUM 7struct phy_config {u32 pixclk;u8 pll_div_regs[PHY_PLL_DIV_REGS_NUM ]; }; +/* +* The calculated_phy_pll_cfg only handles integer divider for PMS, +* meaning the last four entries will be fixed, but the first three will +* be calculated by the PMS calculator. +*/ +static struct phy_config calculated_phy_pll_cfg = { + .pixclk =0 , + .pll_div_regs = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x80 ,0x00 }, +}; + +/* The lookup table contains values for which the fractional divder is used */ static const struct phy_config phy_pll_cfg[] = { { .pixclk =22250000 , - .pll_div_regs = {0x4b ,0xf1 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4b ,0xf1 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =23750000 , - .pll_div_regs = {0x50 ,0xf1 ,0x86 ,0x85 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x50 ,0xf1 ,0x86 ,0x85 ,0x80 ,0x40 }, }, { .pixclk =24000000 , - .pll_div_regs = {0x50 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x50 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =24024000 , - .pll_div_regs = {0x50 ,0xf1 ,0x99 ,0x02 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x50 ,0xf1 ,0x99 ,0x02 ,0x80 ,0x40 }, }, { .pixclk =25175000 , - .pll_div_regs = {0x54 ,0xfc ,0xcc ,0x91 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0xfc ,0xcc ,0x91 ,0x80 ,0x40 }, }, { .pixclk =25200000 , - .pll_div_regs = {0x54 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x54 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =26750000 , - .pll_div_regs = {0x5a ,0xf2 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0xf2 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =27000000 , - .pll_div_regs = {0x5a ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =27027000 , - .pll_div_regs = {0x5a ,0xf2 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0xf2 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =29500000 , - .pll_div_regs = {0x62 ,0xf4 ,0x95 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0xf4 ,0x95 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =30750000 , - .pll_div_regs = {0x66 ,0xf4 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0xf4 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =30888000 , - .pll_div_regs = {0x66 ,0xf4 ,0x99 ,0x18 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0xf4 ,0x99 ,0x18 ,0x88 ,0x45 }, }, { .pixclk =33750000 , - .pll_div_regs = {0x70 ,0xf4 ,0x82 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0xf4 ,0x82 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =35000000 , - .pll_div_regs = {0x58 ,0xb8 ,0x8b ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x58 ,0xb8 ,0x8b ,0x88 ,0x80 ,0x40 }, }, { .pixclk =36000000 , - .pll_div_regs = {0x5a ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =36036000 , - .pll_div_regs = {0x5a ,0xb2 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0xb2 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =40000000 , - .pll_div_regs = {0x64 ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x64 ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =43200000 , - .pll_div_regs = {0x5a ,0x90 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x90 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =43243200 , - .pll_div_regs = {0x5a ,0x92 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x92 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =44500000 , - .pll_div_regs = {0x5c ,0x92 ,0x98 ,0x11 ,0x84 ,0x41 }, + .pll_div_regs = {0xd1 ,0x5c ,0x92 ,0x98 ,0x11 ,0x84 ,0x41 }, }, { .pixclk =47000000 , - .pll_div_regs = {0x62 ,0x94 ,0x95 ,0x82 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x94 ,0x95 ,0x82 ,0x80 ,0x40 }, }, { .pixclk =47500000 , - .pll_div_regs = {0x63 ,0x96 ,0xa1 ,0x82 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x63 ,0x96 ,0xa1 ,0x82 ,0x80 ,0x40 }, }, { .pixclk =50349650 , - .pll_div_regs = {0x54 ,0x7c ,0xc3 ,0x8f ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0x7c ,0xc3 ,0x8f ,0x80 ,0x40 }, }, { .pixclk =50400000 , - .pll_div_regs = {0x54 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x54 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =53250000 , - .pll_div_regs = {0x58 ,0x72 ,0x84 ,0x03 ,0x82 ,0x41 }, + .pll_div_regs = {0xd1 ,0x58 ,0x72 ,0x84 ,0x03 ,0x82 ,0x41 }, }, { .pixclk =53500000 , - .pll_div_regs = {0x5a ,0x72 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x72 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =54000000 , - .pll_div_regs = {0x5a ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =54054000 , - .pll_div_regs = {0x5a ,0x72 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x72 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =59000000 , - .pll_div_regs = {0x62 ,0x74 ,0x95 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x74 ,0x95 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =59340659 , - .pll_div_regs = {0x62 ,0x74 ,0xdb ,0x52 ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x62 ,0x74 ,0xdb ,0x52 ,0x88 ,0x47 }, }, { .pixclk =59400000 , - .pll_div_regs = {0x63 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x63 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =61500000 , - .pll_div_regs = {0x66 ,0x74 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0x74 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =63500000 , - .pll_div_regs = {0x69 ,0x74 ,0x89 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x69 ,0x74 ,0x89 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =67500000 , - .pll_div_regs = {0x54 ,0x52 ,0x87 ,0x03 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0x52 ,0x87 ,0x03 ,0x80 ,0x40 }, }, { .pixclk =70000000 , - .pll_div_regs = {0x58 ,0x58 ,0x8b ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x58 ,0x58 ,0x8b ,0x88 ,0x80 ,0x40 }, }, { .pixclk =72000000 , - .pll_div_regs = {0x5a ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =72072000 , - .pll_div_regs = {0x5a ,0x52 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x52 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =74176000 , - .pll_div_regs = {0x5d ,0x58 ,0xdb ,0xA2 ,0x88 ,0x41 }, + .pll_div_regs = {0xd1 ,0x5d ,0x58 ,0xdb ,0xA2 ,0x88 ,0x41 }, }, { .pixclk =74250000 , - .pll_div_regs = {0x5c ,0x52 ,0x90 ,0x0d ,0x84 ,0x41 }, + .pll_div_regs = {0xd1 ,0x5c ,0x52 ,0x90 ,0x0d ,0x84 ,0x41 }, }, { .pixclk =78500000 , - .pll_div_regs = {0x62 ,0x54 ,0x87 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x54 ,0x87 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =80000000 , - .pll_div_regs = {0x64 ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x64 ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =82000000 , - .pll_div_regs = {0x66 ,0x54 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0x54 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =82500000 , - .pll_div_regs = {0x67 ,0x54 ,0x88 ,0x01 ,0x90 ,0x49 }, + .pll_div_regs = {0xd1 ,0x67 ,0x54 ,0x88 ,0x01 ,0x90 ,0x49 }, }, { .pixclk =89000000 , - .pll_div_regs = {0x70 ,0x54 ,0x84 ,0x83 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0x54 ,0x84 ,0x83 ,0x80 ,0x40 }, }, { .pixclk =90000000 , - .pll_div_regs = {0x70 ,0x54 ,0x82 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0x54 ,0x82 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =94000000 , - .pll_div_regs = {0x4e ,0x32 ,0xa7 ,0x10 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4e ,0x32 ,0xa7 ,0x10 ,0x80 ,0x40 }, }, { .pixclk =95000000 , - .pll_div_regs = {0x50 ,0x31 ,0x86 ,0x85 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x50 ,0x31 ,0x86 ,0x85 ,0x80 ,0x40 }, }, { .pixclk =98901099 , - .pll_div_regs = {0x52 ,0x3a ,0xdb ,0x4c ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x52 ,0x3a ,0xdb ,0x4c ,0x88 ,0x47 }, }, { .pixclk =99000000 , - .pll_div_regs = {0x52 ,0x32 ,0x82 ,0x01 ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x52 ,0x32 ,0x82 ,0x01 ,0x88 ,0x47 }, }, { .pixclk =100699300 , - .pll_div_regs = {0x54 ,0x3c ,0xc3 ,0x8f ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0x3c ,0xc3 ,0x8f ,0x80 ,0x40 }, }, { .pixclk =100800000 , - .pll_div_regs = {0x54 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x54 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =102500000 , - .pll_div_regs = {0x55 ,0x32 ,0x8c ,0x05 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x55 ,0x32 ,0x8c ,0x05 ,0x90 ,0x4b }, }, { .pixclk =104750000 , - .pll_div_regs = {0x57 ,0x32 ,0x98 ,0x07 ,0x90 ,0x49 }, + .pll_div_regs = {0xd1 ,0x57 ,0x32 ,0x98 ,0x07 ,0x90 ,0x49 }, }, { .pixclk =106500000 , - .pll_div_regs = {0x58 ,0x32 ,0x84 ,0x03 ,0x82 ,0x41 }, + .pll_div_regs = {0xd1 ,0x58 ,0x32 ,0x84 ,0x03 ,0x82 ,0x41 }, }, { .pixclk =107000000 , - .pll_div_regs = {0x5a ,0x32 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x32 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =108000000 , - .pll_div_regs = {0x5a ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =108108000 , - .pll_div_regs = {0x5a ,0x32 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x32 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =118000000 , - .pll_div_regs = {0x62 ,0x34 ,0x95 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x34 ,0x95 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =118800000 , - .pll_div_regs = {0x63 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x63 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =123000000 , - .pll_div_regs = {0x66 ,0x34 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0x34 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =127000000 , - .pll_div_regs = {0x69 ,0x34 ,0x89 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x69 ,0x34 ,0x89 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =135000000 , - .pll_div_regs = {0x70 ,0x34 ,0x82 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0x34 ,0x82 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =135580000 , - .pll_div_regs = {0x71 ,0x39 ,0xe9 ,0x82 ,0x9c ,0x5b }, + .pll_div_regs = {0xd1 ,0x71 ,0x39 ,0xe9 ,0x82 ,0x9c ,0x5b }, }, { .pixclk =137520000 , - .pll_div_regs = {0x72 ,0x38 ,0x99 ,0x10 ,0x85 ,0x41 }, + .pll_div_regs = {0xd1 ,0x72 ,0x38 ,0x99 ,0x10 ,0x85 ,0x41 }, }, { .pixclk =138750000 , - .pll_div_regs = {0x73 ,0x35 ,0x88 ,0x05 ,0x90 ,0x4d }, + .pll_div_regs = {0xd1 ,0x73 ,0x35 ,0x88 ,0x05 ,0x90 ,0x4d }, }, { .pixclk =140000000 , - .pll_div_regs = {0x75 ,0x36 ,0xa7 ,0x90 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x75 ,0x36 ,0xa7 ,0x90 ,0x80 ,0x40 }, }, { .pixclk =144000000 , - .pll_div_regs = {0x78 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x78 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =148352000 , - .pll_div_regs = {0x7b ,0x35 ,0xdb ,0x39 ,0x90 ,0x45 }, + .pll_div_regs = {0xd1 ,0x7b ,0x35 ,0xdb ,0x39 ,0x90 ,0x45 }, }, { .pixclk =148500000 , - .pll_div_regs = {0x7b ,0x35 ,0x84 ,0x03 ,0x90 ,0x45 }, + .pll_div_regs = {0xd1 ,0x7b ,0x35 ,0x84 ,0x03 ,0x90 ,0x45 }, }, { .pixclk =154000000 , - .pll_div_regs = {0x40 ,0x18 ,0x83 ,0x01 ,0x00 ,0x40 }, + .pll_div_regs = {0xd1 ,0x40 ,0x18 ,0x83 ,0x01 ,0x00 ,0x40 }, }, { .pixclk =157000000 , - .pll_div_regs = {0x41 ,0x11 ,0xa7 ,0x14 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x41 ,0x11 ,0xa7 ,0x14 ,0x80 ,0x40 }, }, { .pixclk =160000000 , - .pll_div_regs = {0x42 ,0x12 ,0xa1 ,0x20 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x42 ,0x12 ,0xa1 ,0x20 ,0x80 ,0x40 }, }, { .pixclk =162000000 , - .pll_div_regs = {0x43 ,0x18 ,0x8b ,0x08 ,0x96 ,0x55 }, + .pll_div_regs = {0xd1 ,0x43 ,0x18 ,0x8b ,0x08 ,0x96 ,0x55 }, }, { .pixclk =164000000 , - .pll_div_regs = {0x45 ,0x11 ,0x83 ,0x82 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x45 ,0x11 ,0x83 ,0x82 ,0x90 ,0x4b }, }, { .pixclk =165000000 , - .pll_div_regs = {0x45 ,0x11 ,0x84 ,0x81 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x45 ,0x11 ,0x84 ,0x81 ,0x90 ,0x4b }, }, { .pixclk =180000000 , - .pll_div_regs = {0x4b ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x4b ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =185625000 , - .pll_div_regs = {0x4e ,0x12 ,0x9a ,0x95 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4e ,0x12 ,0x9a ,0x95 ,0x80 ,0x40 }, }, { .pixclk =188000000 , - .pll_div_regs = {0x4e ,0x12 ,0xa7 ,0x10 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4e ,0x12 ,0xa7 ,0x10 ,0x80 ,0x40 }, }, { .pixclk =198000000 , - .pll_div_regs = {0x52 ,0x12 ,0x82 ,0x01 ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x52 ,0x12 ,0x82 ,0x01 ,0x88 ,0x47 }, }, { .pixclk =205000000 , - .pll_div_regs = {0x55 ,0x12 ,0x8c ,0x05 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x55 ,0x12 ,0x8c ,0x05 ,0x90 ,0x4b }, }, { .pixclk =209500000 , - .pll_div_regs = {0x57 ,0x12 ,0x98 ,0x07 ,0x90 ,0x49 }, + .pll_div_regs = {0xd1 ,0x57 ,0x12 ,0x98 ,0x07 ,0x90 ,0x49 }, }, { .pixclk =213000000 , - .pll_div_regs = {0x58 ,0x12 ,0x84 ,0x03 ,0x82 ,0x41 }, + .pll_div_regs = {0xd1 ,0x58 ,0x12 ,0x84 ,0x03 ,0x82 ,0x41 }, }, { .pixclk =216000000 , - .pll_div_regs = {0x5a ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =216216000 , - .pll_div_regs = {0x5a ,0x12 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x12 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =237600000 , - .pll_div_regs = {0x63 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x63 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =254000000 , - .pll_div_regs = {0x69 ,0x14 ,0x89 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x69 ,0x14 ,0x89 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =277500000 , - .pll_div_regs = {0x73 ,0x15 ,0x88 ,0x05 ,0x90 ,0x4d }, + .pll_div_regs = {0xd1 ,0x73 ,0x15 ,0x88 ,0x05 ,0x90 ,0x4d }, }, { .pixclk =288000000 , - .pll_div_regs = {0x78 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x78 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =297000000 , - .pll_div_regs = {0x7b ,0x15 ,0x84 ,0x03 ,0x90 ,0x45 }, + .pll_div_regs = {0xd1 ,0x7b ,0x15 ,0x84 ,0x03 ,0x90 ,0x45 }, }, };@@ -322,7 +339,8 @@ struct reg_settings { };static const struct reg_settings common_phy_cfg[] = { - {PHY_REG (0 ),0x00 }, {PHY_REG (1 ),0xd1 }, + {PHY_REG (0 ),0x00 }, +/* PHY_REG(1-7) pix clk specific */ {PHY_REG (8 ),0x4f }, {PHY_REG (9 ),0x30 }, {PHY_REG (10 ),0x33 }, {PHY_REG (11 ),0x65 },/* REG12 pixclk specific */ @@ -415,6 +433,83 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy, phy->regs + PHY_REG(14)); } +static unsigned long fsl_samsung_hdmi_phy_find_pms (unsigned long fout,u8 *p,u16 *m,u8 *s) +{ +unsigned long best_freq =0 ; +u32 min_delta =0xffffffff ; +u8 _p, best_p; +u16 _m, best_m; +u8 _s, best_s; + +/* +* Figure 13-78 of the reference manual states the PLL should be TMDS x 5 +* while the TMDS_CLKO should be the PLL / 5. So to calculate the PLL, +* take the pix clock x 5, then return the value of the PLL / 5. +*/ + fout *=5 ; + +/* The ref manual states the values of 'P' range from 1 to 11 */ +for (_p =1 ; _p <=11 ; ++_p) { +for (_s =1 ; _s <=16 ; ++_s) { +u64 tmp; +u32 delta; + +/* s must be one or even */ +if (_s >1 && (_s &0x01 ) ==1 ) + _s++; + +/* _s cannot be 14 per the TRM */ +if (_s ==14 ) +continue ; + +/* +* TODO: Ref Manual doesn't state the range of _m +* so this should be further refined if possible. +* This range was set based on the original values +* in the lookup table +*/ + tmp = (u64 )fout * (_p * _s); +do_div (tmp,24 *MHZ ); + _m = tmp; +if (_m <0x30 || _m >0x7b ) +continue ; + +/* +* Rev 2 of the Ref Manual states the +* VCO can range between 750MHz and +* 3GHz. The VCO is assumed to be +* is assumed to be (M * f_ref) / P, +* where f_ref is 24MHz. +*/ + tmp = (u64 )_m *24 *MHZ ; +do_div (tmp, _p); +if (tmp <750 *MHZ || + tmp >3000 *MHZ ) +continue ; + +/* Final frequency after post-divider */ +do_div (tmp, _s); + + delta =abs (fout - tmp); +if (delta < min_delta) { + best_p = _p; + best_s = _s; + best_m = _m; + min_delta = delta; + best_freq = tmp; + } + } + } + +if (best_freq) { + *p = best_p; + *m = best_m; + *s = best_s; + } + +return best_freq /5 ; +} +static int fsl_samsung_hdmi_phy_configure (struct fsl_samsung_hdmi_phy *phy,const struct phy_config *cfg) {@@ -428,13 +523,13 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,for (i =0 ; i <ARRAY_SIZE (common_phy_cfg); i++)writeb (common_phy_cfg[i].val, phy->regs + common_phy_cfg[i].reg); -/* set individual PLL registers PHY_REG2 ... PHY_REG7 */ +/* set individual PLL registers PHY_REG1 ... PHY_REG7 */ for (i =0 ; i <PHY_PLL_DIV_REGS_NUM ; i++) -writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (2 ) + i *4 ); +writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (1 ) + i *4 ); -/* High nibble of pll_div_regs[1] contains S which also gets written to REG21 */ +/* High nibble of PHY_REG3 and low nibble of PHY_REG21 both contain 'S' */ writeb (REG21_SEL_TX_CK_INV |FIELD_PREP (REG21_PMS_S_MASK , - cfg->pll_div_regs[1 ] >>4 ), phy->regs +PHY_REG (21 )); + cfg->pll_div_regs[2 ] >>4 ), phy->regs +PHY_REG (21 ));fsl_samsung_hdmi_phy_configure_pll_lock_det (phy, cfg);@@ -459,33 +554,97 @@ static unsigned long phy_clk_recalc_rate(struct clk_hw *hw,return phy->cur_cfg->pixclk; } -static long phy_clk_round_rate (struct clk_hw *hw, -unsigned long rate,unsigned long *parent_rate) +/* Helper function to lookup the available fractional-divider rate */ +static const struct phy_config *fsl_samsung_hdmi_phy_lookup_rate (unsigned long rate) {int i; +/* Search the lookup table */ for (i =ARRAY_SIZE (phy_pll_cfg) -1 ; i >=0 ; i--)if (phy_pll_cfg[i].pixclk <= rate) -return phy_pll_cfg[i].pixclk; +break ; -return -EINVAL ; +return &phy_pll_cfg[i]; +} + +static void fsl_samsung_hdmi_calculate_phy (struct phy_config *cal_phy,unsigned long rate, +u8 p,u16 m,u8 s) +{ + cal_phy->pixclk = rate; + cal_phy->pll_div_regs[0 ] =FIELD_PREP (REG01_PMS_P_MASK , p); + cal_phy->pll_div_regs[1 ] = m; + cal_phy->pll_div_regs[2 ] =FIELD_PREP (REG03_PMS_S_MASK , s-1 ); +/* pll_div_regs 3-6 are fixed and pre-defined already */ +} + +static long phy_clk_round_rate (struct clk_hw *hw, +unsigned long rate,unsigned long *parent_rate) +{ +const struct phy_config *fract_div_phy; +u32 int_div_clk; +u16 m; +u8 p, s; + +/* If the clock is out of range return error instead of searching */ +if (rate >297000000 || rate <22250000 ) +return -EINVAL ; + +/* Search the fractional divider lookup table */ + fract_div_phy =fsl_samsung_hdmi_phy_lookup_rate (rate); + +/* If the rate is an exact match, return that value */ +if (rate == fract_div_phy->pixclk) +return fract_div_phy->pixclk; + +/* If the exact match isn't found, calculate the integer divider */ + int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); + +/* If the int_div_clk rate is an exact match, return that value */ +if (int_div_clk == rate) +return int_div_clk; + +/* If neither rate is an exact match, use the value from the LUT */ +return fract_div_phy->pixclk; }static int phy_clk_set_rate (struct clk_hw *hw,unsigned long rate,unsigned long parent_rate) {struct fsl_samsung_hdmi_phy *phy =to_fsl_samsung_hdmi_phy (hw); -int i; +const struct phy_config *fract_div_phy; +u32 int_div_clk; +u16 m; +u8 p, s; -for (i =ARRAY_SIZE (phy_pll_cfg) -1 ; i >=0 ; i--) -if (phy_pll_cfg[i].pixclk <= rate) -break ; +/* Search the fractional divider lookup table */ + fract_div_phy =fsl_samsung_hdmi_phy_lookup_rate (rate); -if (i <0 ) -return -EINVAL ; +/* If the rate is an exact match, use that value */ +if (fract_div_phy->pixclk == rate) + goto use_fract_div; - phy->cur_cfg = &phy_pll_cfg[i]; +/* +* If the rate from the fractional divder is not exact, check the integer divider, +* and use it if that value is an exact match. +*/ + int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); +if (int_div_clk == rate) { +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , + int_div_clk); + +fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s); + phy->cur_cfg = &calculated_phy_pll_cfg; +return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); + } +/* +* If neither the fractional divder nor the integer divder can find an exact value +* fall back to using the fractional divider +*/ +use_fract_div: + phy->cur_cfg = fract_div_phy; +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , + phy->cur_cfg->pixclk);return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); }
Re: [PATCH V7 3/5] xphy: freescale: fsl-samsung-hdmi: Support dynamic integer
In reply to Adam FordQuoted 3 lines · Adam Ford
There is currently a look-up table for a variety of resolutions. Since the phy has the ability to dynamically calculate the values necessary to use the intger divider which should allow more
^ integer
Quoted 40 lines
resolutions without having to update the look-up-table.
If the lookup table cannot find an exact match, fall back to the dynamic calculator of the integer divider.
Previously, the value of P was hard-coded to 1, this required an update to the
phy_pll_cfgtable to add in the extra value into the table, so if the value of P is calculated to be something else by the PMS calculator, thecalculated_phy_pll_cfgstructure can be used instead without having to keep track of which method was used.Signed-off-by Adam Ford <[email protected]>---
V7: Refactored much of the code to create smaller helper functions
to eliminate redundant code and improve code flow and comment
readability. Any t-b and s-o-b tags removed due to the
extent of the changes.V6: Fix comment typos and remove an unnecesary extra calculation
by using the cached value.V5: No Change V4: No Change V3: Change size of pll_div_regs to include PHY_REG01 (P)Create
calculated_phy_pll_cfgto containe the values Eliminate the PMS calculation fromfsl_samsung_hdmi_phy_configureMake the LUT primary and fall back to integer calculator inphy_clk_round_rate.
Check the range right away to ensure it's reaonsable rather than trying to find a clock only to learn it's outside the range. Overall added notes and comments where stuff may not be intuitive.V2: Update
phy_clk_round_rateandphy_clk_set_rateto both support
the integer clock PMS calculator.--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 371 +++++++++++++------ 1 file changed, 265 insertions(+), 106 deletions(-)drivers/phy/freescale/phy-fsl-samsung-hdmi.c +0
-0
[...]
Quoted 21 lines
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +21
-0+ +/* The ref manual states the values of 'P' range from 1 to 11 */ +for (_p =1 ; _p <=11 ; ++_p) { +for (_s =1 ; _s <=16 ; ++_s) { +u64 tmp; +u32 delta; + +/* s must be one or even */ +if (_s >1 && (_s &0x01 ) ==1 ) + _s++; + +/* _s cannot be 14 per the TRM */ +if (_s ==14 ) +continue ; + +/* +* TODO: Ref Manual doesn't state the range of _m +* so this should be further refined if possible. +* This range was set based on the original values +* in the lookup table +*/
drivers/phy/freescale/phy-fsl-samsung-hdmi.c fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy, · line 480
Quoted 10 lines
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +10
-0+ tmp = (u64 )fout * (_p * _s); +do_div (tmp,24 *MHZ ); + _m = tmp; +if (_m <0x30 || _m >0x7b ) +continue ; + +/* +* Rev 2 of the Ref Manual states the +* VCO can range between 750MHz and +* 3GHz. The VCO is assumed to be
^ whitespace
drivers/phy/freescale/phy-fsl-samsung-hdmi.c fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy, · line 481
Quoted 1 line
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +1
-0+* is assumed to be (M * f_ref) / P,
^ duplicate "is assumed to be"
Quoted 31 lines
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +31
-0+* where f_ref is 24MHz. +*/ + tmp = (u64 )_m *24 *MHZ ; +do_div (tmp, _p); +if (tmp <750 *MHZ || + tmp >3000 *MHZ ) +continue ; + +/* Final frequency after post-divider */ +do_div (tmp, _s); + + delta =abs (fout - tmp); +if (delta < min_delta) { + best_p = _p; + best_s = _s; + best_m = _m; + min_delta = delta; + best_freq = tmp; + } + } + } + +if (best_freq) { + *p = best_p; + *m = best_m; + *s = best_s; + } + +return best_freq /5 ; +} +
[...]
Quoted 12 lines
static int phy_clk_set_rate(struct
clk_hw*hw,drivers/phy/freescale/phy-fsl-samsung-hdmi.c +4
-2unsigned long rate, unsigned long parent_rate) { struct fsl_samsung_hdmi_phy *phy = to_fsl_samsung_hdmi_phy(hw); -int i; +const struct phy_config *fract_div_phy; +u32 int_div_clk; +u16 m; +u8 p, s; -for (i =ARRAY_SIZE (phy_pll_cfg) -1 ; i >=0 ; i--)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c static unsigned long phy_clk_recalc_rate(struct clk_hw *hw, · line 624
Quoted 10 lines
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +5
-4-if (phy_pll_cfg[i].pixclk <= rate) -break ; +/* Search the fractional divider lookup table */ + fract_div_phy =fsl_samsung_hdmi_phy_lookup_rate (rate); -if (i <0 ) -return -EINVAL ; +/* If the rate is an exact match, use that value */ +if (fract_div_phy->pixclk == rate) + goto use_fract_div;
Actually I don't really like the jump here and the even more extensive jumping in the next patch.
Why not simply create another function and do "return use_fract_div()" here and below at the end of phy_clk_set_rate().
Quoted 8 lines
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +6
-1- phy->cur_cfg = &phy_pll_cfg[i]; +/* +* If the rate from the fractional divder is not exact, check the integer divider, +* and use it if that value is an exact match. +*/ + int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); +if (int_div_clk == rate) {
drivers/phy/freescale/phy-fsl-samsung-hdmi.c static unsigned long phy_clk_recalc_rate(struct clk_hw *hw, · line 641
Quoted 10 lines
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +9
-0+dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , + int_div_clk); + +fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s); + phy->cur_cfg = &calculated_phy_pll_cfg; +return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); + } +/* +* If neither the fractional divder nor the integer divder can find an exact value
^ divider ^ divider
Quoted 9 lines
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +6
-0+* fall back to using the fractional divider +*/ +use_fract_div: + phy->cur_cfg = fract_div_phy; +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , + phy->cur_cfg->pixclk);return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); }
PATCH v7 4/5 phy: freescale: fsl-samsung-hdmi: Use closest divider
In reply to Adam FordCurrently, if the clock values cannot be set to the exact rate, the round_rate and set_rate functions use the closest value found in the look-up-table. In preparation of removing values from the LUT that can be calculated evenly with the integer calculator, it's necessary to ensure to check both the look-up-table and the integer divider clock values to get the closest values to the requested value. It does this by measuring the difference between the requested clock value and the closest value in both integer divider calucator and the fractional clock look-up-table.
Which ever has the smallest difference between them is returned as the closest rate.
---
V7: Because of the previous patch refactoring, the flow of this patch
changed quite a bit to use more help functions and goto statements to hopefully make the code flow better and improve comment readability. Because of the change, I removed s-o-b and r-b, and t-b tags.
V6: Simplify the calculation of the closest rate and fix
a situation where the integer divider values may not be properly setup before they are used.
Fixup some comments
V5: No Change V4: New to series --- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 40 ++++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +28 -12
@@ -577,6 +577,16 @@ static void fsl_samsung_hdmi_calculate_phy(struct phy_config *cal_phy, unsigned/* pll_div_regs 3-6 are fixed and pre-defined already */ } +static u32 fsl_samsung_hdmi_phy_get_closest_rate (unsigned long rate, +u32 int_div_clk,u32 frac_div_clk) +{ +/* The int_div_clk may be greater than rate, so cast it and use ABS */ +if (abs ((long )rate - (long )int_div_clk) < (rate - frac_div_clk)) +return int_div_clk; + +return frac_div_clk; +} +static long phy_clk_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *parent_rate) {
@@ -624,27 +634,33 @@ static int phy_clk_set_rate(struct clk_hw *hw, goto use_fract_div;/* -* If the rate from the fractional divder is not exact, check the integer divider, +* If the rate from the fractional divider is not exact, check the integer divider, * and use it if that value is an exact match. */ int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); +fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s);if (int_div_clk == rate) { -dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , - int_div_clk); - -fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s); - phy->cur_cfg = &calculated_phy_pll_cfg; -return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); + goto use_int_div; }/* -* If neither the fractional divder nor the integer divder can find an exact value -* fall back to using the fractional divider +* Compare the difference between the integer clock and the fractional clock against +* the desired clock and which whichever is closest, */ +if (fsl_samsung_hdmi_phy_get_closest_rate (rate, int_div_clk, + fract_div_phy->pixclk) == fract_div_phy->pixclk) + goto use_fract_div; + +use_int_div: +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , int_div_clk); + phy->cur_cfg = &calculated_phy_pll_cfg; + goto end; + use_fract_div: - phy->cur_cfg = fract_div_phy; -dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , - phy->cur_cfg->pixclk); + phy->cur_cfg = fract_div_phy; +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , + phy->cur_cfg->pixclk); +end:return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); }
Signature · 1 line
2.43.0
Re: [PATCH V7 4/5] phy: freescale: fsl-samsung-hdmi: Use closest divider
Adam Ford wrote on Tue, Sep 10, 2024 at 08:28:10PM -0500:
Quoted 10 lines
Currently, if the clock values cannot be set to the exact rate, the
round_rateandset_ratefunctions use the closest value found in the look-up-table. In preparation of removing values from the LUT that can be calculated evenly with the integer calculator, it's necessary to ensure to check both the look-up-table and the integer divider clock values to get the closest values to the requested value. It does this by measuring the difference between the requested clock value and the closest value in both integer divider calucator and the fractional clock look-up-table.
Quoted 4 lines
Which ever has the smallest difference between them is returned as the closest rate.
Signed-off-by Adam Ford <[email protected]>
Thank you for the rework,
Quoted 84 lines
---
V7: Because of the previous patch refactoring, the flow of this patch
changed quite a bit to use more help functions and goto statements to hopefully make the code flow better and improve comment readability. Because of the change, I removed s-o-b and r-b, and t-b tags.V6: Simplify the calculation of the closest rate and fix
a situation where the integer divider values may not be properly setup before they are used.
Fixup some commentsV5: No Change V4: New to series --- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 40 ++++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-)drivers/phy/freescale/phy-fsl-samsung-hdmi.c +28
-12@@ -577,6 +577,16 @@ static void fsl_samsung_hdmi_calculate_phy(struct phy_config *cal_phy, unsigned/* pll_div_regs 3-6 are fixed and pre-defined already */ } +static u32 fsl_samsung_hdmi_phy_get_closest_rate (unsigned long rate, +u32 int_div_clk,u32 frac_div_clk) +{ +/* The int_div_clk may be greater than rate, so cast it and use ABS */ +if (abs ((long )rate - (long )int_div_clk) < (rate - frac_div_clk)) +return int_div_clk; + +return frac_div_clk; +} +static long phy_clk_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *parent_rate) {@@ -624,27 +634,33 @@ static int phy_clk_set_rate(struct clk_hw *hw, goto use_fract_div;/* -* If the rate from the fractional divder is not exact, check the integer divider, +* If the rate from the fractional divider is not exact, check the integer divider, * and use it if that value is an exact match. */ int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); +fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s);if (int_div_clk == rate) { -dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , - int_div_clk); - -fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s); - phy->cur_cfg = &calculated_phy_pll_cfg; -return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); + goto use_int_div; }/* -* If neither the fractional divder nor the integer divder can find an exact value -* fall back to using the fractional divider +* Compare the difference between the integer clock and the fractional clock against +* the desired clock and which whichever is closest, */ +if (fsl_samsung_hdmi_phy_get_closest_rate (rate, int_div_clk, + fract_div_phy->pixclk) == fract_div_phy->pixclk) + goto use_fract_div; + +use_int_div: +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , int_div_clk); + phy->cur_cfg = &calculated_phy_pll_cfg; + goto end; + use_fract_div: - phy->cur_cfg = fract_div_phy; -dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , - phy->cur_cfg->pixclk); + phy->cur_cfg = fract_div_phy; +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , + phy->cur_cfg->pixclk); +end:return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); }
Re: [PATCH V7 4/5] phy: freescale: fsl-samsung-hdmi: Use closest divider
In reply to Adam FordQuoted 9 lines · Adam Ford
Currently, if the clock values cannot be set to the exact rate, the
round_rateandset_ratefunctions use the closest value found in the look-up-table. In preparation of removing values from the LUT that can be calculated evenly with the integer calculator, it's necessary to ensure to check both the look-up-table and the integer divider clock values to get the closest values to the requested value. It does this by measuring the difference between the requested clock value and the closest value in both integer divider calucator and the fractional clock look-up-table.
^ calculator
Quoted 67 lines
Which ever has the smallest difference between them is returned as the closest rate.
Signed-off-by Adam Ford <[email protected]>---
V7: Because of the previous patch refactoring, the flow of this patch
changed quite a bit to use more help functions and goto statements to hopefully make the code flow better and improve comment readability. Because of the change, I removed s-o-b and r-b, and t-b tags.V6: Simplify the calculation of the closest rate and fix
a situation where the integer divider values may not be properly setup before they are used.
Fixup some commentsV5: No Change V4: New to series --- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 40 ++++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-)drivers/phy/freescale/phy-fsl-samsung-hdmi.c +14
-9@@ -577,6 +577,16 @@ static void fsl_samsung_hdmi_calculate_phy(struct phy_config *cal_phy, unsigned/* pll_div_regs 3-6 are fixed and pre-defined already */ } +static u32 fsl_samsung_hdmi_phy_get_closest_rate (unsigned long rate, +u32 int_div_clk,u32 frac_div_clk) +{ +/* The int_div_clk may be greater than rate, so cast it and use ABS */ +if (abs ((long )rate - (long )int_div_clk) < (rate - frac_div_clk)) +return int_div_clk; + +return frac_div_clk; +} +static long phy_clk_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *parent_rate) {@@ -624,27 +634,33 @@ static int phy_clk_set_rate(struct clk_hw *hw, goto use_fract_div;/* -* If the rate from the fractional divder is not exact, check the integer divider, +* If the rate from the fractional divider is not exact, check the integer divider, * and use it if that value is an exact match. */ int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); +fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s);if (int_div_clk == rate) { -dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , - int_div_clk); - -fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s); - phy->cur_cfg = &calculated_phy_pll_cfg; -return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); + goto use_int_div; }/* -* If neither the fractional divder nor the integer divder can find an exact value -* fall back to using the fractional divider +* Compare the difference between the integer clock and the fractional clock against
drivers/phy/freescale/phy-fsl-samsung-hdmi.c static int phy_clk_set_rate(struct clk_hw *hw, · line 657
Quoted 10 lines
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +9
-0+* the desired clock and which whichever is closest, */ +if (fsl_samsung_hdmi_phy_get_closest_rate (rate, int_div_clk, + fract_div_phy->pixclk) == fract_div_phy->pixclk) + goto use_fract_div; + +use_int_div: +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , int_div_clk); + phy->cur_cfg = &calculated_phy_pll_cfg; + goto end;
You are jumping into this part of the code and then back out again to the end of the function. In my opinion this is beyond what is generally considered "good" use of goto. It makes the code hard to read.
Can we rewrite/rearrange this to avoid goto in this function? Just creating additional functions as necessary and calling them in the right places should do the job without having duplicated code, no?
Quoted 12 lines
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +5
-3+ use_fract_div: - phy->cur_cfg = fract_div_phy; -dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , - phy->cur_cfg->pixclk); + phy->cur_cfg = fract_div_phy; +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , + phy->cur_cfg->pixclk); +end:return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); }
PATCH v7 5/5 phy: freescale: fsl-samsung-hdmi: Remove unnecessary LUT entries
In reply to Adam FordThe lookup table contains entries which use the integer divider instead of just the fractional divider. Since the set and round functions check both the integer divider values and the LUT values, it's no longer necessary to keep the integer divider values in the lookup table, as can be dynamically calcuated.
---
V7: No Change
V6: Fix typos in commit message
V5: No Change
V4: New to series
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 83 +++----------------- 1 file changed, 13 insertions(+), 70 deletions(-)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +13 -70
@@ -69,25 +69,16 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 23750000, .pll_div_regs = { 0xd1, 0x50, 0xf1, 0x86, 0x85, 0x80, 0x40 }, - }, { - .pixclk =24000000 , - .pll_div_regs = { 0xd1, 0x50, 0xf0, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk =24024000 , .pll_div_regs = { 0xd1, 0x50, 0xf1, 0x99, 0x02, 0x80, 0x40 }, }, { .pixclk =25175000 , .pll_div_regs = { 0xd1, 0x54, 0xfc, 0xcc, 0x91, 0x80, 0x40 }, - }, { - .pixclk =25200000 , - .pll_div_regs = { 0xd1, 0x54, 0xf0, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =26750000 , .pll_div_regs = { 0xd1, 0x5a, 0xf2, 0x89, 0x88, 0x80, 0x40 }, - }, { - .pixclk =27000000 , - .pll_div_regs = { 0xd1, 0x5a, 0xf0, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =27027000 , .pll_div_regs = { 0xd1, 0x5a, 0xf2, 0xfd, 0x0c, 0x80, 0x40 }, }, {
@@ -105,18 +96,9 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 35000000, .pll_div_regs = { 0xd1, 0x58, 0xb8, 0x8b, 0x88, 0x80, 0x40 }, - }, { - .pixclk =36000000 , - .pll_div_regs = { 0xd1, 0x5a, 0xb0, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =36036000 , .pll_div_regs = { 0xd1, 0x5a, 0xb2, 0xfd, 0x0c, 0x80, 0x40 }, - }, { - .pixclk =40000000 , - .pll_div_regs = { 0xd1, 0x64, 0xb0, 0x00, 0x00, 0x80, 0x00 }, - }, { - .pixclk =43200000 , - .pll_div_regs = { 0xd1, 0x5a, 0x90, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk =43243200 , .pll_div_regs = { 0xd1, 0x5a, 0x92, 0xfd, 0x0c, 0x80, 0x40 },
@@ -132,19 +114,13 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 50349650, .pll_div_regs = { 0xd1, 0x54, 0x7c, 0xc3, 0x8f, 0x80, 0x40 }, - }, { - .pixclk =50400000 , - .pll_div_regs = { 0xd1, 0x54, 0x70, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk =53250000 , .pll_div_regs = { 0xd1, 0x58, 0x72, 0x84, 0x03, 0x82, 0x41 }, }, { .pixclk =53500000 , .pll_div_regs = { 0xd1, 0x5a, 0x72, 0x89, 0x88, 0x80, 0x40 }, - }, { - .pixclk =54000000 , - .pll_div_regs = { 0xd1, 0x5a, 0x70, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =54054000 , .pll_div_regs = { 0xd1, 0x5a, 0x72, 0xfd, 0x0c, 0x80, 0x40 }, }, {
@@ -153,10 +129,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 59340659, .pll_div_regs = { 0xd1, 0x62, 0x74, 0xdb, 0x52, 0x88, 0x47 }, - }, { - .pixclk =59400000 , - .pll_div_regs = { 0xd1, 0x63, 0x70, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =61500000 , .pll_div_regs = { 0xd1, 0x66, 0x74, 0x82, 0x01, 0x88, 0x45 }, }, {
@@ -168,10 +141,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 70000000, .pll_div_regs = { 0xd1, 0x58, 0x58, 0x8b, 0x88, 0x80, 0x40 }, - }, { - .pixclk =72000000 , - .pll_div_regs = { 0xd1, 0x5a, 0x50, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =72072000 , .pll_div_regs = { 0xd1, 0x5a, 0x52, 0xfd, 0x0c, 0x80, 0x40 }, }, {
@@ -183,10 +153,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 78500000, .pll_div_regs = { 0xd1, 0x62, 0x54, 0x87, 0x01, 0x80, 0x40 }, - }, { - .pixclk =80000000 , - .pll_div_regs = { 0xd1, 0x64, 0x50, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =82000000 , .pll_div_regs = { 0xd1, 0x66, 0x54, 0x82, 0x01, 0x88, 0x45 }, }, {
@@ -213,10 +180,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 100699300, .pll_div_regs = { 0xd1, 0x54, 0x3c, 0xc3, 0x8f, 0x80, 0x40 }, - }, { - .pixclk =100800000 , - .pll_div_regs = { 0xd1, 0x54, 0x30, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =102500000 , .pll_div_regs = { 0xd1, 0x55, 0x32, 0x8c, 0x05, 0x90, 0x4b }, }, {
@@ -228,19 +192,13 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 107000000, .pll_div_regs = { 0xd1, 0x5a, 0x32, 0x89, 0x88, 0x80, 0x40 }, - }, { - .pixclk =108000000 , - .pll_div_regs = { 0xd1, 0x5a, 0x30, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =108108000 , .pll_div_regs = { 0xd1, 0x5a, 0x32, 0xfd, 0x0c, 0x80, 0x40 }, }, { .pixclk =118000000 , .pll_div_regs = { 0xd1, 0x62, 0x34, 0x95, 0x08, 0x80, 0x40 }, - }, { - .pixclk =118800000 , - .pll_div_regs = { 0xd1, 0x63, 0x30, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =123000000 , .pll_div_regs = { 0xd1, 0x66, 0x34, 0x82, 0x01, 0x88, 0x45 }, }, {
@@ -261,10 +219,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 140000000, .pll_div_regs = { 0xd1, 0x75, 0x36, 0xa7, 0x90, 0x80, 0x40 }, - }, { - .pixclk =144000000 , - .pll_div_regs = { 0xd1, 0x78, 0x30, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =148352000 , .pll_div_regs = { 0xd1, 0x7b, 0x35, 0xdb, 0x39, 0x90, 0x45 }, }, {
@@ -288,9 +243,6 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 165000000, .pll_div_regs = { 0xd1, 0x45, 0x11, 0x84, 0x81, 0x90, 0x4b }, - }, { - .pixclk =180000000 , - .pll_div_regs = { 0xd1, 0x4b, 0x10, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk =185625000 , .pll_div_regs = { 0xd1, 0x4e, 0x12, 0x9a, 0x95, 0x80, 0x40 },
@@ -309,25 +261,16 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 213000000, .pll_div_regs = { 0xd1, 0x58, 0x12, 0x84, 0x03, 0x82, 0x41 }, - }, { - .pixclk = 216000000, - .pll_div_regs = { 0xd1, 0x5a, 0x10, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk = 216216000, .pll_div_regs = { 0xd1, 0x5a, 0x12, 0xfd, 0x0c, 0x80, 0x40 }, - }, { - .pixclk = 237600000, - .pll_div_regs = { 0xd1, 0x63, 0x10, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk = 254000000, .pll_div_regs = { 0xd1, 0x69, 0x14, 0x89, 0x08, 0x80, 0x40 }, }, { .pixclk = 277500000, .pll_div_regs = { 0xd1, 0x73, 0x15, 0x88, 0x05, 0x90, 0x4d }, - }, { - .pixclk = 288000000, - .pll_div_regs = { 0xd1, 0x78, 0x10, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk = 297000000, .pll_div_regs = { 0xd1, 0x7b, 0x15, 0x84, 0x03, 0x90, 0x45 }, },
Signature · 1 line
2.43.0
Re: [PATCH V7 5/5] phy: freescale: fsl-samsung-hdmi: Remove unnecessary LUT entries
Adam Ford wrote on Tue, Sep 10, 2024 at 08:28:11PM -0500:
Quoted 9 lines
The lookup table contains entries which use the integer divider instead of just the fractional divider. Since the set and round functions check both the integer divider values and the LUT values, it's no longer necessary to keep the integer divider values in the lookup table, as can be dynamically calcuated.
Signed-off-by Adam Ford <[email protected]>Reviewed-by Frieder Schrempf <[email protected]>Tested-by Frieder Schrempf <[email protected]>
not that we'd have done anything different if there was something incoherent, but FWIW I checked re-computing values for these regs match and there was no problem.
Quoted 202 lines
---
V7: No Change
V6: Fix typos in commit message
V5: No Change
V4: New to series--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 83 +++----------------- 1 file changed, 13 insertions(+), 70 deletions(-)drivers/phy/freescale/phy-fsl-samsung-hdmi.c +13
-70@@ -69,25 +69,16 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 23750000, .pll_div_regs = { 0xd1, 0x50, 0xf1, 0x86, 0x85, 0x80, 0x40 }, - }, { - .pixclk =24000000 , - .pll_div_regs = { 0xd1, 0x50, 0xf0, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk =24024000 , .pll_div_regs = { 0xd1, 0x50, 0xf1, 0x99, 0x02, 0x80, 0x40 }, }, { .pixclk =25175000 , .pll_div_regs = { 0xd1, 0x54, 0xfc, 0xcc, 0x91, 0x80, 0x40 }, - }, { - .pixclk =25200000 , - .pll_div_regs = { 0xd1, 0x54, 0xf0, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =26750000 , .pll_div_regs = { 0xd1, 0x5a, 0xf2, 0x89, 0x88, 0x80, 0x40 }, - }, { - .pixclk =27000000 , - .pll_div_regs = { 0xd1, 0x5a, 0xf0, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =27027000 , .pll_div_regs = { 0xd1, 0x5a, 0xf2, 0xfd, 0x0c, 0x80, 0x40 }, }, {@@ -105,18 +96,9 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 35000000, .pll_div_regs = { 0xd1, 0x58, 0xb8, 0x8b, 0x88, 0x80, 0x40 }, - }, { - .pixclk =36000000 , - .pll_div_regs = { 0xd1, 0x5a, 0xb0, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =36036000 , .pll_div_regs = { 0xd1, 0x5a, 0xb2, 0xfd, 0x0c, 0x80, 0x40 }, - }, { - .pixclk =40000000 , - .pll_div_regs = { 0xd1, 0x64, 0xb0, 0x00, 0x00, 0x80, 0x00 }, - }, { - .pixclk =43200000 , - .pll_div_regs = { 0xd1, 0x5a, 0x90, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk =43243200 , .pll_div_regs = { 0xd1, 0x5a, 0x92, 0xfd, 0x0c, 0x80, 0x40 },@@ -132,19 +114,13 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 50349650, .pll_div_regs = { 0xd1, 0x54, 0x7c, 0xc3, 0x8f, 0x80, 0x40 }, - }, { - .pixclk =50400000 , - .pll_div_regs = { 0xd1, 0x54, 0x70, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk =53250000 , .pll_div_regs = { 0xd1, 0x58, 0x72, 0x84, 0x03, 0x82, 0x41 }, }, { .pixclk =53500000 , .pll_div_regs = { 0xd1, 0x5a, 0x72, 0x89, 0x88, 0x80, 0x40 }, - }, { - .pixclk =54000000 , - .pll_div_regs = { 0xd1, 0x5a, 0x70, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =54054000 , .pll_div_regs = { 0xd1, 0x5a, 0x72, 0xfd, 0x0c, 0x80, 0x40 }, }, {@@ -153,10 +129,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 59340659, .pll_div_regs = { 0xd1, 0x62, 0x74, 0xdb, 0x52, 0x88, 0x47 }, - }, { - .pixclk =59400000 , - .pll_div_regs = { 0xd1, 0x63, 0x70, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =61500000 , .pll_div_regs = { 0xd1, 0x66, 0x74, 0x82, 0x01, 0x88, 0x45 }, }, {@@ -168,10 +141,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 70000000, .pll_div_regs = { 0xd1, 0x58, 0x58, 0x8b, 0x88, 0x80, 0x40 }, - }, { - .pixclk =72000000 , - .pll_div_regs = { 0xd1, 0x5a, 0x50, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =72072000 , .pll_div_regs = { 0xd1, 0x5a, 0x52, 0xfd, 0x0c, 0x80, 0x40 }, }, {@@ -183,10 +153,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 78500000, .pll_div_regs = { 0xd1, 0x62, 0x54, 0x87, 0x01, 0x80, 0x40 }, - }, { - .pixclk =80000000 , - .pll_div_regs = { 0xd1, 0x64, 0x50, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =82000000 , .pll_div_regs = { 0xd1, 0x66, 0x54, 0x82, 0x01, 0x88, 0x45 }, }, {@@ -213,10 +180,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 100699300, .pll_div_regs = { 0xd1, 0x54, 0x3c, 0xc3, 0x8f, 0x80, 0x40 }, - }, { - .pixclk =100800000 , - .pll_div_regs = { 0xd1, 0x54, 0x30, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =102500000 , .pll_div_regs = { 0xd1, 0x55, 0x32, 0x8c, 0x05, 0x90, 0x4b }, }, {@@ -228,19 +192,13 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 107000000, .pll_div_regs = { 0xd1, 0x5a, 0x32, 0x89, 0x88, 0x80, 0x40 }, - }, { - .pixclk =108000000 , - .pll_div_regs = { 0xd1, 0x5a, 0x30, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =108108000 , .pll_div_regs = { 0xd1, 0x5a, 0x32, 0xfd, 0x0c, 0x80, 0x40 }, }, { .pixclk =118000000 , .pll_div_regs = { 0xd1, 0x62, 0x34, 0x95, 0x08, 0x80, 0x40 }, - }, { - .pixclk =118800000 , - .pll_div_regs = { 0xd1, 0x63, 0x30, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =123000000 , .pll_div_regs = { 0xd1, 0x66, 0x34, 0x82, 0x01, 0x88, 0x45 }, }, {@@ -261,10 +219,7 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 140000000, .pll_div_regs = { 0xd1, 0x75, 0x36, 0xa7, 0x90, 0x80, 0x40 }, - }, { - .pixclk =144000000 , - .pll_div_regs = { 0xd1, 0x78, 0x30, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk =148352000 , .pll_div_regs = { 0xd1, 0x7b, 0x35, 0xdb, 0x39, 0x90, 0x45 }, }, {@@ -288,9 +243,6 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 165000000, .pll_div_regs = { 0xd1, 0x45, 0x11, 0x84, 0x81, 0x90, 0x4b }, - }, { - .pixclk =180000000 , - .pll_div_regs = { 0xd1, 0x4b, 0x10, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk =185625000 , .pll_div_regs = { 0xd1, 0x4e, 0x12, 0x9a, 0x95, 0x80, 0x40 },@@ -309,25 +261,16 @@ static const struct phy_config phy_pll_cfg[] = { }, { .pixclk = 213000000, .pll_div_regs = { 0xd1, 0x58, 0x12, 0x84, 0x03, 0x82, 0x41 }, - }, { - .pixclk = 216000000, - .pll_div_regs = { 0xd1, 0x5a, 0x10, 0x00, 0x00, 0x80, 0x00 }, }, { .pixclk = 216216000, .pll_div_regs = { 0xd1, 0x5a, 0x12, 0xfd, 0x0c, 0x80, 0x40 }, - }, { - .pixclk = 237600000, - .pll_div_regs = { 0xd1, 0x63, 0x10, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk = 254000000, .pll_div_regs = { 0xd1, 0x69, 0x14, 0x89, 0x08, 0x80, 0x40 }, }, { .pixclk = 277500000, .pll_div_regs = { 0xd1, 0x73, 0x15, 0x88, 0x05, 0x90, 0x4d }, - }, { - .pixclk = 288000000, - .pll_div_regs = { 0xd1, 0x78, 0x10, 0x00, 0x00, 0x80, 0x00 }, - }, { + }, { .pixclk = 297000000, .pll_div_regs = { 0xd1, 0x7b, 0x15, 0x84, 0x03, 0x90, 0x45 }, },