Commit ec3a71a1 authored by Jonas Karlman's avatar Jonas Karlman Committed by sanglipeng
Browse files

phy/rockchip: inno-hdmi: use correct vco_div_5 macro on rk3328 

stable inclusion
from stable-v5.10.195
commit 88813bd9bbb7f00c60f4ca49ac9fffeec5aa066c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I95JOC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=88813bd9bbb7f00c60f4ca49ac9fffeec5aa066c



--------------------------------

[ Upstream commit 644c06df ]

inno_hdmi_phy_rk3328_clk_set_rate() is using the RK3228 macro
when configuring vco_div_5 on RK3328.

Fix this by using correct vco_div_5 macro for RK3328.

Fixes: 53706a11 ("phy: add Rockchip Innosilicon hdmi phy")
Signed-off-by: default avatarJonas Karlman <jonas@kwiboo.se>
Link: https://lore.kernel.org/r/20230615171005.2251032-2-jonas@kwiboo.se


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent bfccfdb7

drivers/phy/rockchip/phy-rockchip-inno-hdmi.c

+2 −2
Original line number Diff line number Diff line
@@ -790,8 +790,8 @@ static int inno_hdmi_phy_rk3328_clk_set_rate(struct clk_hw *hw, 
			 RK3328_PRE_PLL_POWER_DOWN);



	/* Configure pre-pll */

	inno_update_bits(inno, 0xa0, RK3228_PCLK_VCO_DIV_5_MASK,

			 RK3228_PCLK_VCO_DIV_5(cfg->vco_div_5_en));

	inno_update_bits(inno, 0xa0, RK3328_PCLK_VCO_DIV_5_MASK,

			 RK3328_PCLK_VCO_DIV_5(cfg->vco_div_5_en));

	inno_write(inno, 0xa1, RK3328_PRE_PLL_PRE_DIV(cfg->prediv));



	val = RK3328_SPREAD_SPECTRUM_MOD_DISABLE;