ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'phy-fixes-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy

Browse Source 
Pull phy fixes from Vinod Koul:

 - Fix for mediatek driver warning for variable used uninitialized and
   for wrong pll math

* tag 'phy-fixes-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  phy: mediatek: hdmi: mt8195: fix wrong pll calculus
  phy: mediatek: hdmi: mt8195: fix uninitialized variable usage in pll_calc
This commit is contained in:
Linus Torvalds
2023-05-05 11:57:29 -07:00
parent 084f51d473 9d9ff3d2a4
commit b49178e68f
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c
View File

@@ -213,7 +213,7 @@ static int mtk_hdmi_pll_calc(struct mtk_hdmi_phy *hdmi_phy, struct clk_hw *hw,
u64 tmds_clk, pixel_clk, da_hdmitx21_ref_ck, ns_hdmipll_ck, pcw; u64 tmds_clk, pixel_clk, da_hdmitx21_ref_ck, ns_hdmipll_ck, pcw;
u8 txpredivs[4] = { 2, 4, 6, 12 }; u8 txpredivs[4] = { 2, 4, 6, 12 };
u32 fbkdiv_low; u32 fbkdiv_low;
int i, ret; int i;
pixel_clk = rate; pixel_clk = rate;
tmds_clk = pixel_clk; tmds_clk = pixel_clk;
@@ -271,7 +271,7 @@ static int mtk_hdmi_pll_calc(struct mtk_hdmi_phy *hdmi_phy, struct clk_hw *hw,
* [32,24] 9bit integer, [23,0]:24bit fraction * [32,24] 9bit integer, [23,0]:24bit fraction
*/ */
pcw = div_u64(((u64)ns_hdmipll_ck) << PCW_DECIMAL_WIDTH, pcw = div_u64(((u64)ns_hdmipll_ck) << PCW_DECIMAL_WIDTH,
da_hdmitx21_ref_ck / PLL_FBKDIV_HS3); da_hdmitx21_ref_ck * PLL_FBKDIV_HS3);
if (pcw > GENMASK_ULL(32, 0)) if (pcw > GENMASK_ULL(32, 0))
return -EINVAL; return -EINVAL;
@@ -288,17 +288,13 @@ static int mtk_hdmi_pll_calc(struct mtk_hdmi_phy *hdmi_phy, struct clk_hw *hw,
posdiv2 = 1; posdiv2 = 1;
/* Digital clk divider, max /32 */ /* Digital clk divider, max /32 */
digital_div = div_u64((u64)ns_hdmipll_ck, posdiv1 / posdiv2 / pixel_clk); digital_div = div_u64(ns_hdmipll_ck, posdiv1 * posdiv2 * pixel_clk);
if (!(digital_div <= 32 && digital_div >= 1)) if (!(digital_div <= 32 && digital_div >= 1))
return -EINVAL; return -EINVAL;
mtk_hdmi_pll_set_hw(hw, PLL_PREDIV, fbkdiv_high, fbkdiv_low, return mtk_hdmi_pll_set_hw(hw, PLL_PREDIV, fbkdiv_high, fbkdiv_low,
PLL_FBKDIV_HS3, posdiv1, posdiv2, txprediv, PLL_FBKDIV_HS3, posdiv1, posdiv2, txprediv,
txposdiv, digital_div); txposdiv, digital_div);
if (ret)
return -EINVAL;
return 0;
} }
static int mtk_hdmi_pll_drv_setting(struct clk_hw *hw) static int mtk_hdmi_pll_drv_setting(struct clk_hw *hw)